From b59abfdc17d27a7568f3adc2c1b5ae12e9bcd12a Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 12 Apr 2012 11:35:12 +0000 Subject: [PATCH] - Bugfix: Removed the static declaration of NV_AP_COST and BR_FAST_SHIP since they were not cleared (because of static) on a new game (by JMich) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5198 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Laptop/PostalService.cpp | 2 +- Tactical/Interface Panels.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Laptop/PostalService.cpp b/Laptop/PostalService.cpp index 35ed33c2..e131c47f 100644 --- a/Laptop/PostalService.cpp +++ b/Laptop/PostalService.cpp @@ -210,7 +210,7 @@ BOOLEAN CPostalService::AddPackageToShipment(UINT16 usShipmentID, UINT16 usItemI BOOLEAN CPostalService::SendShipment(UINT16 usShipmentID) { - static BOOLEAN BR_FAST_SHIP = gGameExternalOptions.fBobbyRayFastShipments; + BOOLEAN BR_FAST_SHIP = gGameExternalOptions.fBobbyRayFastShipments; if( usShipmentID > _UsedShipmentIDList.size() || !_UsedShipmentIDList[usShipmentID]) { diff --git a/Tactical/Interface Panels.cpp b/Tactical/Interface Panels.cpp index cca65df9..5b14beb5 100644 --- a/Tactical/Interface Panels.cpp +++ b/Tactical/Interface Panels.cpp @@ -3583,7 +3583,7 @@ void SMInvClickCallback( MOUSE_REGION * pRegion, INT32 iReason ) BOOLEAN fNewItem = FALSE; static BOOLEAN fRightDown = FALSE; static BOOLEAN fLeftDown = FALSE; - static bool INV_AP_COST = bool(gGameOptions.fInventoryCostsAP); + BOOLEAN INV_AP_COST = gGameOptions.fInventoryCostsAP; uiHandPos = MSYS_GetRegionUserData( pRegion, 0 );