diff --git a/GameSettings.cpp b/GameSettings.cpp index a8e70096..147a0ff0 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -538,6 +538,7 @@ void LoadGameExternalOptions() // ShadoWarrior: Tooltip changes (start) gGameExternalOptions.ubSoldierTooltipDetailLevel = iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 2); + gGameExternalOptions.fEnableDynamicSoldierTooltips = iniReader.ReadBoolean("JA2 Tactical Settings", "DYNAMIC_SOLDIER_TOOLTIPS", TRUE); gGameExternalOptions.fEnableSoldierTooltipLocation = iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_LOCATION", TRUE); gGameExternalOptions.fEnableSoldierTooltipBrightness = iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_BRIGHTNESS", TRUE); gGameExternalOptions.fEnableSoldierTooltipRangeToTarget = iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_RANGE_TO_TARGET", TRUE); diff --git a/GameSettings.h b/GameSettings.h index 152a8586..c5a615eb 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -143,6 +143,7 @@ typedef struct BOOLEAN fSellAll; INT16 iPriceModifier; + INT32 iMaxIMPMaleCharacters; INT32 iMaxIMPCharacters; INT32 iMinAttribute; INT32 iMaxAttribute; @@ -350,6 +351,7 @@ typedef struct // ShadoWarrior: Tooltip changes (start) UINT8 ubSoldierTooltipDetailLevel; + BOOLEAN fEnableDynamicSoldierTooltips; BOOLEAN fEnableSoldierTooltipLocation; BOOLEAN fEnableSoldierTooltipBrightness; BOOLEAN fEnableSoldierTooltipRangeToTarget; diff --git a/GameVersion.cpp b/GameVersion.cpp index ef91fddb..a5902e92 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.536" }; + INT16 zVersionLabel[256] = { L"Release v1.13.538" }; #endif -INT8 czVersionNumber[16] = { "Build 06.09.18" }; +INT8 czVersionNumber[16] = { "Build 06.09.19" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/JA2.suo b/JA2.suo index 1e933d5e..745808af 100644 Binary files a/JA2.suo and b/JA2.suo differ diff --git a/Tactical/SoldierTooltips.cpp b/Tactical/SoldierTooltips.cpp index 0d60df6f..9e31467a 100644 --- a/Tactical/SoldierTooltips.cpp +++ b/Tactical/SoldierTooltips.cpp @@ -49,8 +49,7 @@ void SoldierTooltip( SOLDIERTYPE* pSoldier ) if ( gusSelectedSoldier != NOBODY ) iRangeToTarget = GetRangeInCellCoordsFromGridNoDiff( MercPtrs[ gusSelectedSoldier ]->sGridNo, sSoldierGridNo ) / 10; - // WANNE NEW - //if ( gGameExternalOptions.fEnableDynamicSoldierTooltips ) + if ( gGameExternalOptions.fEnableDynamicSoldierTooltips ) { for ( INT32 cnt = 0; cnt < MAX_ATTACHMENTS; cnt++ ) {