From d73074206a96db98285bef9dedac0a59748d7663 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 9 Apr 2012 10:24:30 +0000
Subject: [PATCH] - Bobby Ray Fixes (by tazpn) - Region button lingers after
 order screen is closed - Crash when closing order form

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5170 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/BobbyRMailOrder.cpp | 34 ++++++++++++++++++++++++++++------
 Laptop/BobbyRShipments.cpp | 21 +++++++++++++++++----
 2 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/Laptop/BobbyRMailOrder.cpp b/Laptop/BobbyRMailOrder.cpp
index e7fafb36..19909791 100644
--- a/Laptop/BobbyRMailOrder.cpp
+++ b/Laptop/BobbyRMailOrder.cpp
@@ -362,6 +362,7 @@ MOUSE_REGION	 gSelectedUpDownArrowOnGridScrollAreaRegion[2];
 void SelectUpDownArrowOnGridScrollAreaRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
 //mouse region for scroll column in the grid area.
 MOUSE_REGION	*gSelectedGridScrollColumnRegion;
+INT32 gSelectedGridScrollColumnRegionSize;
 void SelectGridScrollColumnRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
 void SelectGridScrollColumnMovementCallBack(MOUSE_REGION * pRegion, INT32 iReason );
 
@@ -647,9 +648,17 @@ void ExitBobbyRMailOrder()
 	}
 	if (gfDrawGridColumnMouseRegion == TRUE)
 	{
-		MSYS_DisableRegion( gSelectedGridScrollColumnRegion);
-		MSYS_RemoveRegion( gSelectedGridScrollColumnRegion);
+		for(i=0; i<gSelectedGridScrollColumnRegionSize; i++)
+		{
+			MSYS_DisableRegion( &gSelectedGridScrollColumnRegion[i] );
+			MSYS_RemoveRegion( &gSelectedGridScrollColumnRegion[i] );
+		}
+		gfDrawGridColumnMouseRegion = FALSE;
 	}
+	if (gSelectedGridScrollColumnRegion != NULL)
+		delete [] gSelectedGridScrollColumnRegion;
+	gSelectedGridScrollColumnRegion = NULL;
+	gSelectedGridScrollColumnRegionSize = 0;
 
 	//if the drop down box is active, destroy it
 	gubDropDownAction = BR_DROP_DOWN_DESTROY;
@@ -1210,15 +1219,28 @@ void DisplayPurchasedItems( BOOLEAN fCalledFromOrderPage, UINT16 usGridX, UINT16
 		MSYS_SetRegionUserData( &gSelectedUpDownArrowOnGridScrollAreaRegion[ 1 ], 0, 1);
 		MSYS_EnableRegion(&gSelectedUpDownArrowOnGridScrollAreaRegion[1]);
 		gfDrawGridArrowMouseRegions = TRUE;
-		}
+	}
 	if (guidivisor > 1)
 	{//Scroll Bar
 		usPosX = usGridX + BOBBYR_GRID_SCROLL_COLUMN_X;
 		usPosY = usGridY + BOBBYR_GRID_SCROLL_UP_ARROW_Y + BOBBYR_SCROLL_ARROW_HEIGHT;
 		usHeight = BOBBYR_GRID_SCROLL_COLUMN_HEIGHT_MINUS_ARROWS / guidivisor;
-		gSelectedGridScrollColumnRegion = new MOUSE_REGION[guidivisor];
-		if (gfDrawGridColumnMouseRegion == FALSE)
+		if (gfDrawGridColumnMouseRegion == FALSE || gSelectedGridScrollColumnRegionSize != guidivisor)
 		{
+			if (gSelectedGridScrollColumnRegion != NULL)
+			{
+				for(i=0; i<gSelectedGridScrollColumnRegionSize; i++)
+				{
+					MSYS_DisableRegion( &gSelectedGridScrollColumnRegion[i] );
+					MSYS_RemoveRegion( &gSelectedGridScrollColumnRegion[i] );
+				}
+				delete [] gSelectedGridScrollColumnRegion;
+			}
+			if (gSelectedGridScrollColumnRegionSize != guidivisor)
+			{
+				gSelectedGridScrollColumnRegion = new MOUSE_REGION[guidivisor];
+				gSelectedGridScrollColumnRegionSize = guidivisor;
+			}
 			for(i=0; i<guidivisor; i++)
 			{
 				MSYS_DefineRegion( &gSelectedGridScrollColumnRegion[i], usPosX, usPosY, (UINT16)(usPosX+BOBBYR_SCROLL_ARROW_WIDTH), (UINT16)(usPosY+usHeight), MSYS_PRIORITY_HIGH,
@@ -1227,7 +1249,7 @@ void DisplayPurchasedItems( BOOLEAN fCalledFromOrderPage, UINT16 usGridX, UINT16
 				MSYS_EnableRegion(&gSelectedGridScrollColumnRegion[i]);
 				MSYS_SetRegionUserData( &gSelectedGridScrollColumnRegion[ i ], 0, i);
 				usPosY += usHeight;
-	}
+			}
 			gfDrawGridColumnMouseRegion = TRUE;
 		}
 		//Draw the rectangle
diff --git a/Laptop/BobbyRShipments.cpp b/Laptop/BobbyRShipments.cpp
index dc6f147e..1dfd53f0 100644
--- a/Laptop/BobbyRShipments.cpp
+++ b/Laptop/BobbyRShipments.cpp
@@ -75,6 +75,7 @@ extern BOOLEAN gfDrawGridColumnMouseRegion;
 extern MOUSE_REGION	 gSelectedUpDownArrowOnGridScrollAreaRegion[2];
 extern void SelectUpDownArrowOnGridScrollAreaRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
 extern MOUSE_REGION	*gSelectedGridScrollColumnRegion;
+extern INT32 gSelectedGridScrollColumnRegionSize;
 extern void SelectGridScrollColumnRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
 extern void SelectGridScrollColumnMovementCallBack(MOUSE_REGION * pRegion, INT32 iReason );
 
@@ -215,8 +216,14 @@ BOOLEAN EnterBobbyRShipments()
 	}
 	if (gfDrawGridColumnMouseRegion == TRUE)
 	{
-		MSYS_DisableRegion( gSelectedGridScrollColumnRegion);
-		MSYS_RemoveRegion( gSelectedGridScrollColumnRegion);
+		for(int i=0; i<gSelectedGridScrollColumnRegionSize; i++)
+		{
+			MSYS_DisableRegion( &gSelectedGridScrollColumnRegion[i] );
+			MSYS_RemoveRegion( &gSelectedGridScrollColumnRegion[i] );
+		}
+		delete [] gSelectedGridScrollColumnRegion;
+		gSelectedGridScrollColumnRegion = NULL;
+		gSelectedGridScrollColumnRegionSize = 0;
 		gfDrawGridColumnMouseRegion = FALSE;
 	}
 	CreatePreviousShipmentsMouseRegions();
@@ -248,8 +255,14 @@ void ExitBobbyRShipments()
 }
 	if (gfDrawGridColumnMouseRegion == TRUE)
 	{
-		MSYS_DisableRegion( gSelectedGridScrollColumnRegion);
-		MSYS_RemoveRegion( gSelectedGridScrollColumnRegion);
+		for(int i=0; i<gSelectedGridScrollColumnRegionSize; i++)
+		{
+			MSYS_DisableRegion( &gSelectedGridScrollColumnRegion[i] );
+			MSYS_RemoveRegion( &gSelectedGridScrollColumnRegion[i] );
+		}
+		delete [] gSelectedGridScrollColumnRegion;
+		gSelectedGridScrollColumnRegion = NULL;
+		gSelectedGridScrollColumnRegionSize = 0;
 		gfDrawGridColumnMouseRegion = FALSE;
 	}
 }