From 7fcf6e7cb5764ecfeab9c7954a918ef1dac1e4f1 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 23 May 2006 19:34:48 +0000
Subject: [PATCH] Little Alien

- Externalized BREATH_GAIN_REDUCTION_PER_RAIN_INTENSITY setting


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@78 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameSettings.cpp    | 2 +-
 GameSettings.h      | 1 +
 GameVersion.cpp     | 2 +-
 JA2.vcproj          | 4 ++--
 Tactical/Points.cpp | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/GameSettings.cpp b/GameSettings.cpp
index c3b06f28b..b9bfc1adb 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);
 
 	// 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 41cfb35e8..f8e2b38aa 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -217,6 +217,7 @@ typedef struct
 	UINT16 gusRainMaxLength;
 	UINT32 guiMaxRainDrops;
 	UINT32 ubWeaponReliabilityReductionPerRainIntensity;
+	UINT32 ubBreathGainReductionPerRainIntensity;
 
 	// Thunder settings
 	UINT32 guiMinLightningInterval;
diff --git a/GameVersion.cpp b/GameVersion.cpp
index 9767380f5..d323ec10b 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.77 2006.05.21" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.78 2006.05.23" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index 07a0c65f6..2463ec66f 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.77_2006_05_21.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.78_2006_05_23.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.77_2006_05_21.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.78_2006_05_23.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Tactical/Points.cpp b/Tactical/Points.cpp
index ed174d412..afd5bd17c 100644
--- a/Tactical/Points.cpp
+++ b/Tactical/Points.cpp
@@ -27,7 +27,7 @@
 #endif
 
 //rain
-#define BREATH_GAIN_REDUCTION_PER_RAIN_INTENSITY 25
+//#define BREATH_GAIN_REDUCTION_PER_RAIN_INTENSITY 25
 //end rain
 
 extern BOOLEAN IsValidSecondHandShot( SOLDIERTYPE *pSoldier );
@@ -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 * BREATH_GAIN_REDUCTION_PER_RAIN_INTENSITY  / 100 ;
+		sBreathPerAP -= sBreathPerAP * gbCurrentRainIntensity * gGameExternalOptions.ubBreathGainReductionPerRainIntensity  / 100 ;
 	}
 	//end rain