From 4caae3fc6e418debe3790e297d6a890ae6c1d077 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 25 Jul 2012 08:21:23 +0000
Subject: [PATCH] - New EXE Build: 5423

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameInitOptionsScreen.cpp |  8 +++++++-
 GameVersion.cpp           | 18 +++++++++---------
 ja2_VS2005.vcproj         |  4 ++--
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/GameInitOptionsScreen.cpp b/GameInitOptionsScreen.cpp
index 03fc01e1..443b8d98 100644
--- a/GameInitOptionsScreen.cpp
+++ b/GameInitOptionsScreen.cpp
@@ -551,6 +551,12 @@ UINT32	guiOverheatingOptionToggles[ GIO_NUM_ONOFF_BUTTONS ];
 void BtnGIOOverheatingOffCallback(GUI_BUTTON *btn,INT32 reason);
 void BtnGIOOverheatingOnCallback(GUI_BUTTON *btn,INT32 reason);
 
+// Food System
+UINT32	guiFoodSystemOptionTogglesImage[ GIO_NUM_ONOFF_BUTTONS ];
+UINT32	guiFoodSystemOptionToggles[ GIO_NUM_ONOFF_BUTTONS ];
+void BtnGIOFoodSystemOffCallback(GUI_BUTTON *btn,INT32 reason);
+void BtnGIOFoodSystemOnCallback(GUI_BUTTON *btn,INT32 reason);
+
 
 UINT32	guiTimedTurnToggles[ GIO_NUM_TIMED_TURN_OPTIONS ];
 void BtnTimedTurnsTogglesCallback(GUI_BUTTON *btn,INT32 reason);
@@ -2463,7 +2469,7 @@ BOOLEAN		ExitGIOScreen()
 	for( cnt=0; cnt<GIO_NUM_ONOFF_BUTTONS; cnt++)
 	{
 		RemoveButton( guiFoodSystemOptionToggles[ cnt ] );
-		UnloadButtonImage( guiFoodSystemptionTogglesImage[ cnt ] );
+		UnloadButtonImage( guiFoodSystemOptionTogglesImage[ cnt ] );
 	}
 
 	gfGIOButtonsAllocated = FALSE;
diff --git a/GameVersion.cpp b/GameVersion.cpp
index 6d157780..c81185af 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -15,9 +15,9 @@
 #ifdef JA2EDITOR
 	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.5393 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Unfinished Business - Map Editor v1.13.5423 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.5393 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.5423 (Development Build)" }; 
 	#endif
 
 // ------------------------------
@@ -27,11 +27,11 @@
 
 	//DEBUG BUILD VERSION	
 	#ifdef JA2UB
-		CHAR16 zVersionLabel[256]		= { L"Debug: Unfinished Business - v1.13.5393 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: Unfinished Business - v1.13.5423 (Development Build)" }; 
 	#elif defined (JA113DEMO) || defined (JA113NODEMO)
-		CHAR16 zVersionLabel[256]		= { L"Debug: JA2 Demo - v1.13.5393 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: JA2 Demo - v1.13.5423 (Development Build)" }; 
 	#else
-		CHAR16 zVersionLabel[256]		= { L"Debug: v1.13.5393 (Development Build)" }; 
+		CHAR16 zVersionLabel[256]		= { L"Debug: v1.13.5423 (Development Build)" }; 
 	#endif
 
 #elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
 
 	//RELEASE BUILD VERSION	
 	#ifdef JA2UB
-		CHAR16		zVersionLabel[256]		= { L"Release Unfinished Business - v1.13.5393 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release Unfinished Business - v1.13.5423 (Development Build)" };
 	#elif defined (JA113DEMO) || defined (JA113NODEMO)		
-		CHAR16		zVersionLabel[256]		= { L"Release JA2 Demo - v1.13.5393 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release JA2 Demo - v1.13.5423 (Development Build)" };
 	#else
-		CHAR16		zVersionLabel[256]		= { L"Release v1.13.5393 (Development Build)" };
+		CHAR16		zVersionLabel[256]		= { L"Release v1.13.5423 (Development Build)" };
 	#endif
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 12.07.12" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 12.07.25" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
 	
 // SAVE_GAME_VERSION is defined in header, change it there
diff --git a/ja2_VS2005.vcproj b/ja2_VS2005.vcproj
index 49b6a0a4..2a332d25 100644
--- a/ja2_VS2005.vcproj
+++ b/ja2_VS2005.vcproj
@@ -145,7 +145,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib DbgHelp.lib"
-				OutputFile="$(OutDir)\JA2_EN_Release_5393.exe"
+				OutputFile="$(OutDir)\JA2_EN_Release_5423.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"
@@ -229,7 +229,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib DbgHelp.lib"
-				OutputFile="$(OutDir)\MapEditor_EN_Release_5393.exe"
+				OutputFile="$(OutDir)\MapEditor_EN_Release_5423.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"