From 6bd8399bb9d29422c3a50b8355626f8e9e6994bc Mon Sep 17 00:00:00 2001 From: Wanne Date: Thu, 4 Apr 2013 21:49:33 +0000 Subject: [PATCH] - Changed INI-Property "RANDOM_STATS" from int (0 - 3) to boolean value FALSE = Do not use random stats (JA2 vanilla setting) TRUE = Use random stats for any mercs, that have random stats defined (Enabled = 1) in "TableData\RandomStats.xml" git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5982 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 2 +- GameSettings.h | 2 +- Tactical/Soldier Profile.cpp | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 0a3506fcf..6a7e3d152 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -849,7 +849,7 @@ void LoadGameExternalOptions() // Buggler: setting to show/hide skills/traits in AIM & MERC hiring page gGameExternalOptions.fShowSkillsInHirePage = iniReader.ReadBoolean("Recruitment Settings", "SHOW_SKILLS_IN_HIRING_PAGE", FALSE); - gGameExternalOptions.ubMercRandomStats = iniReader.ReadInteger("Recruitment Settings", "MERCS_RANDOM_STATS", 0, 0, 2); + gGameExternalOptions.fMercRandomStats = iniReader.ReadBoolean("Recruitment Settings", "MERCS_RANDOM_STATS", FALSE); //################# Financial Settings ################# diff --git a/GameSettings.h b/GameSettings.h index 5d670d207..b12184cd0 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -1141,7 +1141,7 @@ typedef struct BOOLEAN fShowSkillsInHirePage; - UINT8 ubMercRandomStats; + BOOLEAN fMercRandomStats; BOOLEAN fBobbyRayFastShipments; diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp index a4159a10d..fd56d52c8 100644 --- a/Tactical/Soldier Profile.cpp +++ b/Tactical/Soldier Profile.cpp @@ -439,13 +439,7 @@ void RandomStats () for ( cnt = 0; cnt < NUM_PROFILES; cnt++ ) { - BOOLEAN randomStatsEnabled = FALSE; - - // WANNE: Random Stats are based on the INI entry (MERCS_RANDOM_STATS) - if ((gGameExternalOptions.ubMercRandomStats == 1) || (gGameExternalOptions.ubMercRandomStats == 2 && gRandomStatsValue[cnt].Enabled)) - randomStatsEnabled = TRUE; - - if ( randomStatsEnabled == TRUE ) + if (gGameExternalOptions.fMercRandomStats == TRUE && gRandomStatsValue[cnt].Enabled) { bBaseAttribute = gRandomStatsValue[cnt].BaseAttribute + ( 4 * gRandomStatsValue[cnt].ExpLevel ); pProfile = &(gMercProfiles[cnt]);