diff --git a/GameSettings.cpp b/GameSettings.cpp index eeb92e76..f47acc80 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -372,7 +372,7 @@ void LoadGameExternalOptions() gGameExternalOptions.gusRainMaxLength = iniReader.ReadInteger("JA2 Rain Settings","RAIN_MAX_LENGTH_IN_MINUTES",180); gGameExternalOptions.guiMaxRainDrops = iniReader.ReadInteger("JA2 Rain Settings","MAX_RAIN_DROPS",80); gGameExternalOptions.ubWeaponReliabilityReductionPerRainIntensity = iniReader.ReadInteger("JA2 Rain Settings","WEAPON_RELIABILITY_REDUCTION_PER_RAIN_INTENSITY",0); - gGameExternalOptions.ubBreathGainReductionPerRainIntensity = iniReader.ReadInteger("JA2 Rain Settings","BREATH_GAIN_REDUCTION_PER_RAIN_INTENSITY",25); + gGameExternalOptions.ubBreathGainReductionPerRainIntensity = iniReader.ReadFloat("JA2 Rain Settings","BREATH_GAIN_REDUCTION_PER_RAIN_INTENSITY",25); // Thunder settings gGameExternalOptions.guiMinLightningInterval = iniReader.ReadInteger("JA2 Thunder Settings","MIN_INTERVAL_BETWEEN_LIGHTNINGS_IN_REAL_TIME_SECONDS",5); diff --git a/GameSettings.h b/GameSettings.h index 661cc3c8..253e8004 100644 --- a/GameSettings.h +++ b/GameSettings.h @@ -215,7 +215,7 @@ typedef struct UINT16 gusRainMaxLength; UINT32 guiMaxRainDrops; UINT32 ubWeaponReliabilityReductionPerRainIntensity; - UINT32 ubBreathGainReductionPerRainIntensity; + double ubBreathGainReductionPerRainIntensity; // Thunder settings UINT32 guiMinLightningInterval; diff --git a/GameVersion.cpp b/GameVersion.cpp index 654ec7cd..87a1de7c 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.85" }; + INT16 zVersionLabel[256] = { L"Release v1.13.118" }; #endif diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp index afd5bd17..152a333d 100644 --- a/Tactical/Points.cpp +++ b/Tactical/Points.cpp @@ -856,7 +856,7 @@ INT16 GetBreathPerAP( SOLDIERTYPE *pSoldier, UINT16 usAnimState ) // Reduce breath gain on 25%/rain intensity if( sBreathPerAP < 0 && ( pSoldier->bLevel ||!FindStructure( pSoldier->sGridNo, STRUCTURE_ROOF ) ) && pSoldier->bBreath > 1) { - sBreathPerAP -= sBreathPerAP * gbCurrentRainIntensity * gGameExternalOptions.ubBreathGainReductionPerRainIntensity / 100 ; + sBreathPerAP -= (INT16)( sBreathPerAP * gbCurrentRainIntensity * gGameExternalOptions.ubBreathGainReductionPerRainIntensity / 100 ); } //end rain