diff --git a/GameSettings.cpp b/GameSettings.cpp index 6c2fcc9d..1e2d5bf8 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -780,6 +780,8 @@ void LoadGameExternalOptions() //afp - use bullet tracers? gGameExternalOptions.gbBulletTracer = iniReader.ReadBoolean("JA2 Gameplay Settings","USE_BULLET_TRACERS",FALSE); + + gGameExternalOptions.fRestrictFemaleEnemiesExceptElite = iniReader.ReadBoolean("JA2 Gameplay Settings","RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE",FALSE); } diff --git a/GameSettings.h b/GameSettings.h index c55b1a8b..96e3e277 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -451,6 +451,10 @@ BOOLEAN gbBulletTracer; FLOAT ubWrongMagMult; // CHRISL: Setting to turn off the description and stack popup options from the sector inventory panel BOOLEAN fSectorDesc; + + // WANNE: Restrict female enemies from beeing in the queens army (except Female Elite enemies)? + BOOLEAN fRestrictFemaleEnemiesExceptElite; + } GAME_EXTERNAL_OPTIONS; //This structure will contain general Ja2 settings NOT individual game settings. diff --git a/GameVersion.cpp b/GameVersion.cpp index 28bc7e96..cc1b696a 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -13,12 +13,12 @@ #ifdef JA2EDITOR //MAP EDITOR BUILD VERSION -CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2322" }; +CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.2342" }; #elif defined JA2BETAVERSION //BETA/TEST BUILD VERSION -CHAR16 zVersionLabel[256] = { L"Debug v1.13.2322" }; +CHAR16 zVersionLabel[256] = { L"Debug v1.13.2342" }; #elif defined CRIPPLED_VERSION @@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - CHAR16 zVersionLabel[256] = { L"Release v1.13.2322" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.2342" }; #endif -CHAR8 czVersionNumber[16] = { "Build 08.08.30" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 08.09.09" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; diff --git a/Tactical/Soldier Create.cpp b/Tactical/Soldier Create.cpp index 9b66c913..1f94059d 100644 --- a/Tactical/Soldier Create.cpp +++ b/Tactical/Soldier Create.cpp @@ -728,13 +728,16 @@ SOLDIERTYPE* TacticalCreateSoldier( SOLDIERCREATE_STRUCT *pCreateStruct, UINT8 * Soldier.ubBattleSoundID = (UINT8)Random( 3 ); } - // Lesh: disable this - yeah! its feminism! :) + // WANNE: Extnernalized! // ATE: TEMP : No enemy women mercs (unless elite)! - //if( Soldier.ubProfile == NO_PROFILE && Soldier.bTeam == ENEMY_TEAM && - // Soldier.ubBodyType == REGFEMALE && Soldier.ubSoldierClass != SOLDIER_CLASS_ELITE ) - //{ - // Soldier.ubBodyType = (UINT8)( REGMALE + Random( 3 ) ); - //} + if (gGameExternalOptions.fRestrictFemaleEnemiesExceptElite == TRUE) + { + if( Soldier.ubProfile == NO_PROFILE && Soldier.bTeam == ENEMY_TEAM && + Soldier.ubBodyType == REGFEMALE && Soldier.ubSoldierClass != SOLDIER_CLASS_ELITE ) + { + Soldier.ubBodyType = (UINT8)( REGMALE + Random( 3 ) ); + } + } // ATE // Set some values for variation in anims...