From bd5138315b106c7b5fab01a139c0c2c974430ea6 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 31 May 2006 21:39:26 +0000
Subject: [PATCH] - fixed strings for Auto Resolve - leadership increase when
 commanding militia

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@148 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp              |  2 +-
 JA2.vcproj                   |  4 ++--
 Strategic/Auto Resolve.cpp   |  6 ++++++
 Tactical/Militia Control.cpp | 12 ++++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 694696d12..98b629d15 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.147" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.148" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index e40996bf2..76f3b7123 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.147_2006_05_30.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.148_2006_05_30.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.147_2006_05_30.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.148_2006_05_30.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp
index f0268d457..bf018504f 100644
--- a/Strategic/Auto Resolve.cpp	
+++ b/Strategic/Auto Resolve.cpp	
@@ -1737,6 +1737,9 @@ void RenderAutoResolve()
 	
 	switch( gubEnemyEncounterCode )
 	{
+		case NO_ENCOUNTER_CODE:
+			swprintf( str, gpStrategicString[STR_AR_ATTACK_HEADER] );
+			break;
 		case ENEMY_ENCOUNTER_CODE:
 			swprintf( str, gpStrategicString[STR_AR_ENCOUNTER_HEADER] );
 			break;
@@ -1744,6 +1747,9 @@ void RenderAutoResolve()
 		case CREATURE_ATTACK_CODE:
 			swprintf( str, gpStrategicString[STR_AR_DEFEND_HEADER] );
 			break;
+		default: 
+			swprintf( str, gpStrategicString[STR_AR_ATTACK_HEADER] );
+			break;
 	}
 
 	xp = gpAR->sCenterStartX + 70 - StringPixLength( str, FONT10ARIALBOLD )/2;
diff --git a/Tactical/Militia Control.cpp b/Tactical/Militia Control.cpp
index 825288e56..19f3daf4a 100644
--- a/Tactical/Militia Control.cpp	
+++ b/Tactical/Militia Control.cpp	
@@ -1184,6 +1184,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1209,6 +1210,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1255,6 +1257,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1303,6 +1306,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1329,6 +1333,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1369,6 +1374,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1402,6 +1408,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1433,6 +1440,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1495,6 +1503,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1548,6 +1557,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1582,6 +1592,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu
@@ -1656,6 +1667,7 @@ void MilitiaControlMenuBtnCallBack( MOUSE_REGION * pRegion, INT32 iReason )
 						if ( GetSoldier( &pSoldier, gusSelectedSoldier )  )
 						{
 							DeductPoints( pSoldier, AP_TALK, 0 );
+							StatChange( pSoldier, LDRAMT, 1, FALSE );
 						}
 
 						// stop showing menu