diff --git a/GameVersion.cpp b/GameVersion.cpp index 9690bf1f..2d7e8d48 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 445b1817..ecde7d82 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 96e8f0d5..86b89c20 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 48e7b04d..d0857d33 100644 --- a/Utils/Utils_2005Express.vcproj +++ b/Utils/Utils_2005Express.vcproj @@ -606,6 +606,10 @@ RelativePath=".\Utilities.cpp" > + + diff --git a/Utils/Win Util.cpp b/Utils/Win Util.cpp index 79b6c73f..78f6df82 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 987fbb9c..a2acdd5b 100644 --- a/ja2_2005Express.vcproj +++ b/ja2_2005Express.vcproj @@ -145,7 +145,7 @@