1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6160 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-06-26 07:22:06 +00:00
parent 5130c43d50
commit f43521f1fb
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameSettings.cpp
+3 -2
View File
@@ -1910,8 +1910,9 @@ void LoadGameExternalOptions()
//################# Shopkeeper Inventory Settings ################## //################# Shopkeeper Inventory Settings ##################
// WDS - Improve Tony's and Devin's inventory like BR's // WDS - Improve Tony's and Devin's inventory like BR's
gGameExternalOptions.tonyUsesBRSetting = iniReader.ReadBoolean("Shopkeeper Inventory Settings","TONY_USES_BOBBY_RAYS_SETTING", FALSE); // silversurfer: not used anymore, see "Tactical\XML_Merchants.cpp" for "useBRSetting"
gGameExternalOptions.devinUsesBRSetting = iniReader.ReadBoolean("Shopkeeper Inventory Settings","DEVIN_USES_BOBBY_RAYS_SETTING", FALSE); // 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 // chance that Tony will be in his office - silversurfer/SANDRO
gGameExternalOptions.ubChanceTonyAvailable = iniReader.ReadInteger("Shopkeeper Inventory Settings","CHANCE_TONY_AVAILABLE", 80, 0, 100); gGameExternalOptions.ubChanceTonyAvailable = iniReader.ReadInteger("Shopkeeper Inventory Settings","CHANCE_TONY_AVAILABLE", 80, 0, 100);
GameSettings.h
+3 -2
View File
@@ -493,8 +493,9 @@ typedef struct
BOOLEAN fAccessOtherMercInventories; BOOLEAN fAccessOtherMercInventories;
// WDS - Improve Tony's and Devin's inventory like BR's // WDS - Improve Tony's and Devin's inventory like BR's
BOOLEAN tonyUsesBRSetting; // silversurfer: not used anymore, see "Tactical\XML_Merchants.cpp" for "useBRSetting"
BOOLEAN devinUsesBRSetting; // BOOLEAN tonyUsesBRSetting;
// BOOLEAN devinUsesBRSetting;
// WDS - Smart goggle switching // WDS - Smart goggle switching
BOOLEAN smartGoggleSwitch; BOOLEAN smartGoggleSwitch;