From 861ee7d197a9a065a1f176fc234904afd2fe9d18 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 10 Jul 2006 21:00:57 +0000
Subject: [PATCH] - bug fix: Drassen assault not happening regardless of the
 setting in ini

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

diff --git a/GameSettings.cpp b/GameSettings.cpp
index eefeb13cd..e23ad406e 100644
--- a/GameSettings.cpp
+++ b/GameSettings.cpp
@@ -385,7 +385,7 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.ubGameProgressStartMadlabQuest = iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_START_MADLAB_QUEST",35);
 	gGameExternalOptions.ubGameProgressMikeAvailable	= iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_MIKE_AVALIABLE",50);
 	gGameExternalOptions.ubGameProgressIggyAvaliable	= iniReader.ReadInteger("JA2 Gameplay Settings","GAME_PROGRESS_IGGY_AVALIABLE",70);
-	gGameExternalOptions.gfSendTroopsToDrassen			= iniReader.ReadInteger("JA2 Gameplay Settings","STRATEGIC_EVENT_SEND_TROOPS_TO_DRASSEN",TRUE);
+	gGameExternalOptions.ubSendTroopsToDrassen			= iniReader.ReadBoolean("JA2 Gameplay Settings","STRATEGIC_EVENT_SEND_TROOPS_TO_DRASSEN",TRUE);
 	
 
 	//Weapons modification
diff --git a/GameSettings.h b/GameSettings.h
index ec83bebad..7964e9fa5 100644
--- a/GameSettings.h
+++ b/GameSettings.h
@@ -246,7 +246,7 @@ typedef struct
 	UINT32 ubGameProgressStartMadlabQuest;
 	UINT32 ubGameProgressMikeAvailable;
 	UINT32 ubGameProgressIggyAvaliable;
-	BOOLEAN gfSendTroopsToDrassen;
+	BOOLEAN ubSendTroopsToDrassen;
 
 
 	//Gameplay settings
diff --git a/GameVersion.cpp b/GameVersion.cpp
index 2c4135f51..29922477e 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.341" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.342" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index 8fc66d84a..b4805194f 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.340_2006_07_10.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.342_2006_07_10.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.340_2006_07_10.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.342_2006_07_10.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Strategic/Strategic AI.cpp b/Strategic/Strategic AI.cpp
index bbac12d5f..61a7779b8 100644
--- a/Strategic/Strategic AI.cpp	
+++ b/Strategic/Strategic AI.cpp	
@@ -4016,7 +4016,7 @@ void ExecuteStrategicAIAction( UINT16 usActionCode, INT16 sSectorX, INT16 sSecto
 
 			//MoveSAIGroupToSector( &pGroup, ubSectorID, EVASIVE, pGroup->pEnemyGroup->ubIntention );
 
-			if ( !gGameExternalOptions.gfSendTroopsToDrassen )
+			if ( !gGameExternalOptions.ubSendTroopsToDrassen )
 				break;
 
 			ubSourceSectorID = SEC_H13;