1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- New EXE Build: 5423

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2012-07-25 08:21:23 +00:00
parent 36055d4e4f
commit 4caae3fc6e
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameInitOptionsScreen.cpp
+7 -1
View File
@@ -551,6 +551,12 @@ UINT32 guiOverheatingOptionToggles[ GIO_NUM_ONOFF_BUTTONS ];
void BtnGIOOverheatingOffCallback(GUI_BUTTON *btn,INT32 reason); void BtnGIOOverheatingOffCallback(GUI_BUTTON *btn,INT32 reason);
void BtnGIOOverheatingOnCallback(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 ]; UINT32 guiTimedTurnToggles[ GIO_NUM_TIMED_TURN_OPTIONS ];
void BtnTimedTurnsTogglesCallback(GUI_BUTTON *btn,INT32 reason); void BtnTimedTurnsTogglesCallback(GUI_BUTTON *btn,INT32 reason);
@@ -2463,7 +2469,7 @@ BOOLEAN ExitGIOScreen()
for( cnt=0; cnt<GIO_NUM_ONOFF_BUTTONS; cnt++) for( cnt=0; cnt<GIO_NUM_ONOFF_BUTTONS; cnt++)
{ {
RemoveButton( guiFoodSystemOptionToggles[ cnt ] ); RemoveButton( guiFoodSystemOptionToggles[ cnt ] );
UnloadButtonImage( guiFoodSystemptionTogglesImage[ cnt ] ); UnloadButtonImage( guiFoodSystemOptionTogglesImage[ cnt ] );
} }
gfGIOButtonsAllocated = FALSE; gfGIOButtonsAllocated = FALSE;
GameVersion.cpp
+9 -9
View File
@@ -15,9 +15,9 @@
#ifdef JA2EDITOR #ifdef JA2EDITOR
#ifdef JA2UB #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 #else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.5393 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.5423 (Development Build)" };
#endif #endif
// ------------------------------ // ------------------------------
@@ -27,11 +27,11 @@
//DEBUG BUILD VERSION //DEBUG BUILD VERSION
#ifdef JA2UB #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) #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 #else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.5393 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: v1.13.5423 (Development Build)" };
#endif #endif
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -46,16 +46,16 @@
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
#ifdef JA2UB #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) #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 #else
CHAR16 zVersionLabel[256] = { L"Release v1.13.5393 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release v1.13.5423 (Development Build)" };
#endif #endif
#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" }; CHAR16 zTrackingNumber[16] = { L"Z" };
// SAVE_GAME_VERSION is defined in header, change it there // SAVE_GAME_VERSION is defined in header, change it there
ja2_VS2005.vcproj
+2 -2
View File
@@ -145,7 +145,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib DbgHelp.lib" 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" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
GenerateMapFile="true" GenerateMapFile="true"
@@ -229,7 +229,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="Winmm.lib .\Multiplayer\raknet\RakNetLibStatic.lib ws2_32.lib DbgHelp.lib" 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" LinkIncremental="1"
GenerateDebugInformation="true" GenerateDebugInformation="true"
GenerateMapFile="true" GenerateMapFile="true"