- Bugfix: Bobby Ray Quality and Quantity was initialized with wrong values (not the ones from the Start new Game Screen)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-07-10 13:47:11 +00:00
parent 5c3115d743
commit cc89500c72
+8 -10
View File
@@ -615,12 +615,11 @@ UINT32 GameInitOptionsScreenInit( void )
// Difficulty Level (Default: Experienced = 1)
gGameOptions.ubDifficultyLevel = ((UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_DIFFICULTY_LEVEL, 1)) + 1;
// Bobby Ray's Selection (Default: Good = 1)
UINT8 ubBobbyRayQuality = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_BOBBY_RAY_QUALITY, 1);
gGameOptions.ubBobbyRayQuality = max(min(1, ubBobbyRayQuality),10);
// Bobby Ray Quantity (Default: Great = 2)
gGameOptions.ubBobbyRayQuality = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_BOBBY_RAY_QUALITY, 2);
UINT8 ubBobbyRayQuantity = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_BOBBY_RAY_QUANTITY, 1);
gGameOptions.ubBobbyRayQuantity = max(min(1, ubBobbyRayQuantity),10);
// Bobby Ray Quantity (Default: Great = 2)
gGameOptions.ubBobbyRayQuantity = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_BOBBY_RAY_QUANTITY, 2);
// Max. IMP Characters
UINT8 maxIMPCharacterCount = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_MAX_IMP_CHARACTERS, 1);
@@ -3479,12 +3478,11 @@ UINT32 GameInitOptionsScreenInit( void )
// Difficulty Level (Default: Experienced = 1)
gGameOptions.ubDifficultyLevel = ((UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_DIFFICULTY_LEVEL, 1)) + 1;
// Bobby Ray's Selection (Default: Good = 1)
UINT8 ubBobbyRayQuality = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_BOBBY_RAY_QUALITY, 1);
gGameOptions.ubBobbyRayQuality = max(min(1, ubBobbyRayQuality),10);
// Bobby Ray Quantity (Default: Great = 2)
gGameOptions.ubBobbyRayQuality = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_BOBBY_RAY_QUALITY, 2);
UINT8 ubBobbyRayQuantity = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_BOBBY_RAY_QUANTITY, 1);
gGameOptions.ubBobbyRayQuantity = max(min(1, ubBobbyRayQuantity),10);
// Bobby Ray Quantity (Default: Great = 2)
gGameOptions.ubBobbyRayQuantity = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_BOBBY_RAY_QUANTITY, 2);
// Max. IMP Characters
UINT8 maxIMPCharacterCount = (UINT8)props.getIntProperty(JA2SP_INI_INITIAL_SECTION, JA2SP_MAX_IMP_CHARACTERS, 1);