From 0a91067d2469012c2cf38637e9173cfa7ac2eaf8 Mon Sep 17 00:00:00 2001
From: Shadooow <Shadooow@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 24 Jun 2021 18:36:22 +0000
Subject: [PATCH] formatting and efficiency changes to previous commit

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9103 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Tactical Save.cpp | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/Tactical/Tactical Save.cpp b/Tactical/Tactical Save.cpp
index dee42753..40e32bfd 100644
--- a/Tactical/Tactical Save.cpp	
+++ b/Tactical/Tactical Save.cpp	
@@ -1809,7 +1809,6 @@ BOOLEAN LoadRottingCorpsesFromTempCorpseFile( INT16 sMapX, INT16 sMapY, INT8 bMa
 	UINT32	uiNumberOfCorpses=0;
 	UINT32		cnt;
 	ROTTING_CORPSE_DEFINITION		def;
-	BOOLEAN                     fDontAddCorpse = FALSE;
 	INT8                        bTownId;
 	
 	//Delete the existing rotting corpse array
@@ -1850,8 +1849,6 @@ BOOLEAN LoadRottingCorpsesFromTempCorpseFile( INT16 sMapX, INT16 sMapY, INT8 bMa
 
 	for( cnt=0; cnt<uiNumberOfCorpses; ++cnt )
 	{
-		fDontAddCorpse = FALSE;
-
 		// Load the Rotting corpses info
 		FileRead( hFile, &def, sizeof( ROTTING_CORPSE_DEFINITION ), &uiNumBytesRead );
 		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
 						if ( ( GetWorldTotalMin( ) - def.uiTimeOfDeath ) >= 30 )
 						{
-							fDontAddCorpse = TRUE;
+							continue;
 						}
 					}
 				}
 			}
 		}
 
-		if ( !fDontAddCorpse )
+		//add the rotting corpse info
+		if( AddRottingCorpse( &def ) == -1 )
 		{
-			//add the rotting corpse info
-			if( AddRottingCorpse( &def ) == -1 )
-			{
-				DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Failed to add a corpse to GridNo # %d", def.sGridNo ) );
-				/*
-				Assert( 0 );
-				FileClose( hFile );
-				return( FALSE );
-				*/
-			}
+			DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Failed to add a corpse to GridNo # %d", def.sGridNo ) );
+			/*
+			Assert( 0 );
+			FileClose( hFile );
+			return( FALSE );
+			*/
 		}
 	}