- Tactical militia command: stopped merc from moving to militia in combat if he doesn't have a headset (radio)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@736 3b4a5df2-a311-0410-b5c6-a8a6f20db521

GameVersion.cpp

@@ -23,12 +23,12 @@ INT16		zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION  
-	INT16		zVersionLabel[256]		= { L"Release v1.13.728" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.736" };
 
 
 #endif
 										
-INT8		czVersionNumber[16]	= { "Build 07.02.22" };		//YY.MM.DD
+INT8		czVersionNumber[16]	= { "Build 07.02.24" };		//YY.MM.DD
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 

JA2.vcproj

@@ -546,7 +546,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib winmm.lib smackw32.lib mss32.lib fmodvc.lib"
-				OutputFile="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.725_EN.exe"
+				OutputFile="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.736_EN.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"

Tactical/Handle UI.cpp

@@ -5712,6 +5712,12 @@ BOOLEAN HandleTalkInit(  )
 
 
 			if ( ( uiRange > commandRange ) && ( !CheckIfRadioIsEquipped() ) ) //lal
+			{
+				if( (gTacticalStatus.uiFlags & TURNBASED) && (gTacticalStatus.uiFlags & INCOMBAT) )				
+				{
+					return( FALSE );
+				}
+				else
 				{
 					// First get an adjacent gridno....
 					sActionGridNo =  FindAdjacentGridEx( pSoldier, pTSoldier->sGridNo, &ubDirection, NULL, FALSE, TRUE );
@@ -5753,6 +5759,7 @@ BOOLEAN HandleTalkInit(  )
 
 					return( FALSE );
 				}
+			}
 			else
 			{
 				sAPCost = AP_TALK;