From 0c6801fb61726231bf8187319c58f6381581129c Mon Sep 17 00:00:00 2001
From: lalien <lalien@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 24 Mar 2009 20:41:54 +0000
Subject: [PATCH] Fixed szSoundEffects definition

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 GameVersion.cpp                |  6 +++---
 Tactical/XML_Sounds.cpp        |  2 ++
 Utils/Sound Control.h          |  2 +-
 Utils/Utils_2005Express.vcproj |  4 ++++
 Utils/Win Util.cpp             | 26 +++++++++++++-------------
 ja2_2005Express.vcproj         |  2 +-
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/GameVersion.cpp b/GameVersion.cpp
index 9690bf1f7..2d7e8d48f 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -18,7 +18,7 @@ CHAR16 zVersionLabel[256]		= { L"Map Editor v1.13.2389" };
 #elif defined JA2BETAVERSION
 
 //BETA/TEST BUILD VERSION
-CHAR16 zVersionLabel[256]		= { L"Debug v1.13.2436" }; 
+CHAR16 zVersionLabel[256]		= { L"Debug v1.13.2633" }; 
 
 #elif defined CRIPPLED_VERSION
 
@@ -28,11 +28,11 @@ CHAR16 zVersionLabel[256]		= { L"Beta v. 0.98" };
 #else
 
 	//RELEASE BUILD VERSION	
-	CHAR16		zVersionLabel[256]		= { L"Release v1.13.2628" };
+	CHAR16		zVersionLabel[256]		= { L"Release v1.13.2633" };
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 09.03.19" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 09.03.24" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
 	
 
diff --git a/Tactical/XML_Sounds.cpp b/Tactical/XML_Sounds.cpp
index 445b1817d..ecde7d82c 100644
--- a/Tactical/XML_Sounds.cpp
+++ b/Tactical/XML_Sounds.cpp
@@ -43,6 +43,8 @@
 	#include "XML.h"
 #endif
 
+extern char szSoundEffects[MAX_SAMPLES][255];
+
 struct
 {
 	PARSE_STAGE	curElement;
diff --git a/Utils/Sound Control.h b/Utils/Sound Control.h
index 96e8f0d5e..86b89c20f 100644
--- a/Utils/Sound Control.h	
+++ b/Utils/Sound Control.h	
@@ -407,7 +407,7 @@ typedef void (*SOUND_STOP_CALLBACK)( void *pData );
 
 extern UINT8 AmbientVols[NUM_AMBIENTS];
 
-extern char szSoundEffects[MAX_SAMPLES][255];
+//extern char szSoundEffects[MAX_SAMPLES][255];
 
 
 BOOLEAN InitJA2Sound( );
diff --git a/Utils/Utils_2005Express.vcproj b/Utils/Utils_2005Express.vcproj
index 48e7b04d2..d0857d339 100644
--- a/Utils/Utils_2005Express.vcproj
+++ b/Utils/Utils_2005Express.vcproj
@@ -606,6 +606,10 @@
 				RelativePath=".\Utilities.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\Win Util.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\WordWrap.cpp"
 				>
diff --git a/Utils/Win Util.cpp b/Utils/Win Util.cpp
index 79b6c73f4..78f6df824 100644
--- a/Utils/Win Util.cpp	
+++ b/Utils/Win Util.cpp	
@@ -44,20 +44,20 @@ LPDIRECTSOUND           lpDS = NULL;
 LPDIRECTSOUNDBUFFER     lpSoundEffects[NUM_SOUND_EFFECTS];
 
 
-
+extern char szSoundEffects[MAX_SAMPLES][255];
 //char szSoundEffects[NUM_SOUND_EFFECTS][255] =
-char szSoundEffects[MAX_SAMPLES][255] =
-{
-    "SHOOT1",
-		"MISS1",
-		"FALL1",
-		"HIT1",
-		"HIT2",
-		"DOOROPEN1",
-		"DOORCLOSE1",
-		"BURST1",
-		"ENDTURN"
-};
+//char szSoundEffects[MAX_SAMPLES][255] =
+//{
+//    "SHOOT1",
+//		"MISS1",
+//		"FALL1",
+//		"HIT1",
+//		"HIT2",
+//		"DOOROPEN1",
+//		"DOORCLOSE1",
+//		"BURST1",
+//		"ENDTURN"
+//};
 
 /*
  * DSEnable
diff --git a/ja2_2005Express.vcproj b/ja2_2005Express.vcproj
index 987fbb9cd..a2acdd5bc 100644
--- a/ja2_2005Express.vcproj
+++ b/ja2_2005Express.vcproj
@@ -145,7 +145,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib"
-				OutputFile="$(OutDir)\ja2_release_2628_en.exe"
+				OutputFile="$(OutDir)\ja2_release_2633_en.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				GenerateMapFile="true"