From 1d00e73866933cd3139edb1e1360822d81ca3fc3 Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 4 Mar 2007 18:04:07 +0000
Subject: [PATCH] - fixed "end move & LOS bug" ('END' button has two different
 actions)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@751 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp               |  4 ++--
 JA2.vcproj                    |  2 +-
 Tactical/Turn Based Input.cpp | 23 ++++++++++++-----------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index feee7821..a0428843 100644
--- a/GameVersion.cpp
+++ b/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.748" };
+	INT16		zVersionLabel[256]		= { L"Release v1.13.751" };
 
 
 #endif
 										
-INT8		czVersionNumber[16]	= { "Build 07.03.01" };		//YY.MM.DD
+INT8		czVersionNumber[16]	= { "Build 07.03.04" };		//YY.MM.DD
 INT16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/JA2.vcproj b/JA2.vcproj
index 600364fd..05f6be47 100644
--- a/JA2.vcproj
+++ b/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.748_EN.exe"
+				OutputFile="D:\games\Jagged Alliance 2 v1.13\ja2 v1.13.751_EN.exe"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Tactical/Turn Based Input.cpp b/Tactical/Turn Based Input.cpp
index 4bcea7b6..7ccd8bea 100644
--- a/Tactical/Turn Based Input.cpp	
+++ b/Tactical/Turn Based Input.cpp	
@@ -2760,18 +2760,19 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
 						//GoIntoOverheadMap();
 						break;
 
-				case END:
+				// Lalien: commented out, to fix "end move & LOS bug" (same button has two different actions)
+				//case END:
 
-						if ( gusSelectedSoldier != NOBODY )
-						{
-							if ( CheckForMercContMove( MercPtrs[ gusSelectedSoldier ] ) )
-							{
-								// Continue
-								ContinueMercMovement( MercPtrs[ gusSelectedSoldier ] );
-								ErasePath( TRUE );
-							}
-						}
-						break;
+				//		if ( gusSelectedSoldier != NOBODY )
+				//		{
+				//			if ( CheckForMercContMove( MercPtrs[ gusSelectedSoldier ] ) )
+				//			{
+				//				// Continue
+				//				ContinueMercMovement( MercPtrs[ gusSelectedSoldier ] );
+				//				ErasePath( TRUE );
+				//			}
+				//		}
+				//		break;
 
 				case HOME: