Changed version number display (so that we don't have to alter 8 lines to change the revision number)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8578 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-07-14 22:03:43 +00:00
parent b6d6e4f627
commit c96bed1110
6 changed files with 16 additions and 14 deletions
+1 -1
View File
@@ -4077,7 +4077,7 @@ BOOLEAN IsDriveLetterACDromDrive( STR pDriveLetter )
void DisplayGameSettings( ) void DisplayGameSettings( )
{ {
//Display the version number //Display the version number
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s: %s (%S)", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s: %s (%S) %s", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber, zRevisionNumber );
//Display the difficulty level //Display the difficulty level
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s: %s", gzGIOScreenText[ GIO_DIF_LEVEL_TEXT ], zDiffSetting[gGameOptions.ubDifficultyLevel].szDiffName ); ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s: %s", gzGIOScreenText[ GIO_DIF_LEVEL_TEXT ], zDiffSetting[gGameOptions.ubDifficultyLevel].szDiffName );
+9 -8
View File
@@ -15,9 +15,9 @@
#ifdef JA2EDITOR #ifdef JA2EDITOR
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.8576 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8576 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Map Editor v1.13 (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.8576 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8576 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8576 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Debug: v1.13 (Development Build)" };
#endif #endif
#elif defined CRIPPLED_VERSION #elif defined CRIPPLED_VERSION
@@ -46,16 +46,17 @@
//RELEASE BUILD VERSION //RELEASE BUILD VERSION
#ifdef JA2UB #ifdef JA2UB
CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.8576 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13 (Development Build)" };
#elif defined (JA113DEMO) #elif defined (JA113DEMO)
CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8576 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13 (Development Build)" };
#else #else
CHAR16 zVersionLabel[256] = { L"Release v1.13.8576 (Development Build)" }; CHAR16 zVersionLabel[256] = { L"Release v1.13 (Development Build)" };
#endif #endif
#endif #endif
CHAR8 czVersionNumber[16] = { "Build 18.07.14" }; //YY.MM.DD CHAR8 czVersionNumber[16] = { "Build 18.07.14" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" }; CHAR16 zTrackingNumber[16] = { L"Z" };
CHAR16 zRevisionNumber[16] = { L"Revision 8577" };
// SAVE_GAME_VERSION is defined in header, change it there // SAVE_GAME_VERSION is defined in header, change it there
+1
View File
@@ -14,6 +14,7 @@ extern "C" {
extern CHAR16 zVersionLabel[256]; extern CHAR16 zVersionLabel[256];
extern CHAR8 czVersionNumber[16]; extern CHAR8 czVersionNumber[16];
extern CHAR16 zTrackingNumber[16]; extern CHAR16 zTrackingNumber[16];
extern CHAR16 zRevisionNumber[16];
//ADB: I needed these here so I moved them, and why put them in *.cpp anyways? //ADB: I needed these here so I moved them, and why put them in *.cpp anyways?
+1 -1
View File
@@ -105,7 +105,7 @@ extern void InitSightRange(); //lal
UINT32 MainMenuScreenInit( ) UINT32 MainMenuScreenInit( )
{ {
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Version Label: %S", zVersionLabel )); DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Version Label: %S, %s", zVersionLabel, zRevisionNumber ));
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Version #: %s", czVersionNumber )); DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Version #: %s", czVersionNumber ));
DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Tracking #: %S", zTrackingNumber )); DebugMsg( TOPIC_JA2, DBG_LEVEL_3, String("Tracking #: %S", zTrackingNumber ));
@@ -101,7 +101,7 @@ INT32 RecordExceptionInfo( EXCEPTION_POINTERS *pExceptInfo )
#ifdef JA2 #ifdef JA2
//Dispay Ja's version number //Dispay Ja's version number
ErrorLog( hFile, "%S: %s. %S",zVersionLabel, czVersionNumber, zTrackingNumber ); ErrorLog( hFile, "%S %S: %s. %S",zVersionLabel, zRevisionNumber, czVersionNumber, zTrackingNumber );
//Insert a new line //Insert a new line
ErrorLog( hFile, zNewLine ); ErrorLog( hFile, zNewLine );
+2 -2
View File
@@ -386,9 +386,9 @@ UINT32 InitScreenHandle(void)
//mprintf( 10, 420, zVersionLabel ); //mprintf( 10, 420, zVersionLabel );
#ifdef _DEBUG #ifdef _DEBUG
mprintf( 10, 10, L"%s: %s Debug %S", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber ); mprintf( 10, 10, L"%s: %s Debug %S %s", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber, zRevisionNumber );
#else #else
mprintf( 10, 10, L"%s: %s %S", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber ); mprintf( 10, 10, L"%s: %s %S %s", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber, zRevisionNumber );
#endif #endif
#if defined JA2BETAVERSION #if defined JA2BETAVERSION