1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

formatting and efficiency changes to previous commit

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9103 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Shadooow
2021-06-24 18:36:22 +00:00
parent 3acb96f8e6
commit 0a91067d24
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Tactical Save.cpp
+9 -15
View File
@@ -1809,7 +1809,6 @@ BOOLEAN LoadRottingCorpsesFromTempCorpseFile( INT16 sMapX, INT16 sMapY, INT8 bMa
UINT32 uiNumberOfCorpses=0; UINT32 uiNumberOfCorpses=0;
UINT32 cnt; UINT32 cnt;
ROTTING_CORPSE_DEFINITION def; ROTTING_CORPSE_DEFINITION def;
BOOLEAN fDontAddCorpse = FALSE;
INT8 bTownId; INT8 bTownId;
//Delete the existing rotting corpse array //Delete the existing rotting corpse array
@@ -1850,8 +1849,6 @@ BOOLEAN LoadRottingCorpsesFromTempCorpseFile( INT16 sMapX, INT16 sMapY, INT8 bMa
for( cnt=0; cnt<uiNumberOfCorpses; ++cnt ) for( cnt=0; cnt<uiNumberOfCorpses; ++cnt )
{ {
fDontAddCorpse = FALSE;
// Load the Rotting corpses info // Load the Rotting corpses info
FileRead( hFile, &def, sizeof( ROTTING_CORPSE_DEFINITION ), &uiNumBytesRead ); FileRead( hFile, &def, sizeof( ROTTING_CORPSE_DEFINITION ), &uiNumBytesRead );
if( uiNumBytesRead != sizeof( ROTTING_CORPSE_DEFINITION ) ) if( uiNumBytesRead != sizeof( ROTTING_CORPSE_DEFINITION ) )
@@ -1910,25 +1907,22 @@ BOOLEAN LoadRottingCorpsesFromTempCorpseFile( INT16 sMapX, INT16 sMapY, INT8 bMa
// OK, finally, check TOC vs game time to see if at least some time has passed // OK, finally, check TOC vs game time to see if at least some time has passed
if ( ( GetWorldTotalMin( ) - def.uiTimeOfDeath ) >= 30 ) if ( ( GetWorldTotalMin( ) - def.uiTimeOfDeath ) >= 30 )
{ {
fDontAddCorpse = TRUE; continue;
} }
} }
} }
} }
} }
if ( !fDontAddCorpse ) //add the rotting corpse info
if( AddRottingCorpse( &def ) == -1 )
{ {
//add the rotting corpse info DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Failed to add a corpse to GridNo # %d", def.sGridNo ) );
if( AddRottingCorpse( &def ) == -1 ) /*
{ Assert( 0 );
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Failed to add a corpse to GridNo # %d", def.sGridNo ) ); FileClose( hFile );
/* return( FALSE );
Assert( 0 ); */
FileClose( hFile );
return( FALSE );
*/
}
} }
} }