From f43521f1fb1ef5c8dc7ed968e23ec30a56f9eebd Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 26 Jun 2013 07:22:06 +0000 Subject: [PATCH] BUGZILLA #629: Removed unused TONY_USES_BOBBY_RAYS_SETTING and DEVIN_USES_BOBBY_RAYS_SETTING from game, because they are externalized to the merchants xml files (by silversurfer) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6160 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 5 +++-- GameSettings.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 7e96194f..9c035cc9 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -1910,8 +1910,9 @@ void LoadGameExternalOptions() //################# Shopkeeper Inventory Settings ################## // WDS - Improve Tony's and Devin's inventory like BR's - gGameExternalOptions.tonyUsesBRSetting = iniReader.ReadBoolean("Shopkeeper Inventory Settings","TONY_USES_BOBBY_RAYS_SETTING", FALSE); - gGameExternalOptions.devinUsesBRSetting = iniReader.ReadBoolean("Shopkeeper Inventory Settings","DEVIN_USES_BOBBY_RAYS_SETTING", FALSE); + // silversurfer: not used anymore, see "Tactical\XML_Merchants.cpp" for "useBRSetting" + // gGameExternalOptions.tonyUsesBRSetting = iniReader.ReadBoolean("Shopkeeper Inventory Settings","TONY_USES_BOBBY_RAYS_SETTING", FALSE); + // gGameExternalOptions.devinUsesBRSetting = iniReader.ReadBoolean("Shopkeeper Inventory Settings","DEVIN_USES_BOBBY_RAYS_SETTING", FALSE); // chance that Tony will be in his office - silversurfer/SANDRO gGameExternalOptions.ubChanceTonyAvailable = iniReader.ReadInteger("Shopkeeper Inventory Settings","CHANCE_TONY_AVAILABLE", 80, 0, 100); diff --git a/GameSettings.h b/GameSettings.h index e9518b03..b02fdc16 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -493,8 +493,9 @@ typedef struct BOOLEAN fAccessOtherMercInventories; // WDS - Improve Tony's and Devin's inventory like BR's - BOOLEAN tonyUsesBRSetting; - BOOLEAN devinUsesBRSetting; + // silversurfer: not used anymore, see "Tactical\XML_Merchants.cpp" for "useBRSetting" + // BOOLEAN tonyUsesBRSetting; + // BOOLEAN devinUsesBRSetting; // WDS - Smart goggle switching BOOLEAN smartGoggleSwitch;