- 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
This commit is contained in:
Wanne
2012-04-09 10:24:30 +00:00
parent 6c8a1905ca
commit d73074206a
2 changed files with 45 additions and 10 deletions
+17 -4
View File
@@ -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;
}
}