From f8b3f82cfcd65daf4eebf6d9902c4e41b3cf0dd7 Mon Sep 17 00:00:00 2001
From: Lesh <Lesh@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 10 Dec 2006 12:25:17 +0000
Subject: [PATCH] - memory leaking killer pack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@647 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/mapscreen.cpp    | 18 +++++++++++++++++-
 Tactical/Tactical Save.cpp |  5 +++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index 79809c6d..6bf41b33 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -3028,7 +3028,23 @@ UINT32 MapScreenInit(void)
 
 
 UINT32 MapScreenShutdown(void)
-{ 
+{
+	// destroy some popup boxes
+	fShowAssignmentMenu = FALSE;
+	CreateDestroyAssignmentPopUpBoxes( );
+
+	fShowContractMenu = FALSE;
+	DetermineIfContractMenuCanBeShown( );
+	RemoveBox(ghContractBox);
+	ghContractBox = -1;
+
+	if ( ghRemoveMercAssignBox != -1 )
+	{
+		fShowRemoveMenu = FALSE;
+		RemoveBox( ghRemoveMercAssignBox );
+		ghRemoveMercAssignBox = -1;
+	}
+
 	// free up alloced mapscreen messages
 	FreeGlobalMessageList( );
 
diff --git a/Tactical/Tactical Save.cpp b/Tactical/Tactical Save.cpp
index cb1daf0c..ecbaab74 100644
--- a/Tactical/Tactical Save.cpp	
+++ b/Tactical/Tactical Save.cpp	
@@ -1366,7 +1366,10 @@ BOOLEAN LoadAndAddWorldItemsFromTempFile( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
 
 	//Load the World Items from the file
 	if( !LoadWorldItemsFromTempItemFile( sMapX, sMapY, bMapZ, pWorldItems ) )
+	{
+		MemFree( pWorldItems );
 		return( FALSE );
+	}
 
 
 	//If we have already been to the sector
@@ -1416,6 +1419,8 @@ BOOLEAN LoadAndAddWorldItemsFromTempFile( INT16 sMapX, INT16 sMapY, INT8 bMapZ )
 		}
 	}
 
+	MemFree( pWorldItems );
+
 	return( TRUE );
 }