From fa99f2ff83387ca08cffb01569038fa6387862b8 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 8 Jun 2006 23:42:00 +0000
Subject: [PATCH] - bug fix: CTD when new merc arrives

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

diff --git a/GameVersion.cpp b/GameVersion.cpp
index c2c3bf59..3d90621e 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.202" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.206" };
 
 
 #endif
diff --git a/JA2.vcproj b/JA2.vcproj
index ac5721e1..7624c8d7 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.202_2006_06_07.exe"
+				OutputFile="C:\games\Jagged Alliance 2 v1.13\ja2_debug_v1.13.206_2006_06_07.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.202_2006_06_07.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_release_v1.13.206_2006_06_07.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp
index 86ba685e..125a7ca7 100644
--- a/Strategic/Auto Resolve.cpp	
+++ b/Strategic/Auto Resolve.cpp	
@@ -4888,7 +4888,7 @@ BOOLEAN GetCurrentBattleSectorXYZ( INT16 *psSectorX, INT16 *psSectorY, INT16 *ps
 //Returns TRUE if a battle is happening ONLY
 BOOLEAN GetCurrentBattleSectorXYZAndReturnTRUEIfThereIsABattle( INT16 *psSectorX, INT16 *psSectorY, INT16 *psSectorZ )
 {
-	if ( ( *psSectorX == NULL )||(*psSectorY == NULL )||(*psSectorZ == NULL ) )
+	if ( ( psSectorX == NULL )||(psSectorY == NULL )||(psSectorZ == NULL ) )
 	{	
 		return FALSE;
 	}
@@ -4934,6 +4934,8 @@ void AutoBandageFinishedCallback( UINT8 ubResult )
 
 BOOLEAN ProcessLoyalty()
 {
+	if( !gpAR ) return FALSE;
+
 	if( PlayerMercsInSector( gpAR->ubSectorX, gpAR->ubSectorY, 0 ) )
 		return TRUE;