diff --git a/GameSettings.cpp b/GameSettings.cpp index a62f6e37..a248746a 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -4077,7 +4077,7 @@ BOOLEAN IsDriveLetterACDromDrive( STR pDriveLetter ) void DisplayGameSettings( ) { //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 ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"%s: %s", gzGIOScreenText[ GIO_DIF_LEVEL_TEXT ], zDiffSetting[gGameOptions.ubDifficultyLevel].szDiffName ); diff --git a/GameVersion.cpp b/GameVersion.cpp index e65ea40c..cbf9d0d5 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.8576 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.8576 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #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) - CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.8576 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.8576 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13 (Development Build)" }; #endif #elif defined CRIPPLED_VERSION @@ -46,16 +46,17 @@ //RELEASE BUILD VERSION #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) - CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.8576 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Release v1.13.8576 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13 (Development Build)" }; #endif #endif CHAR8 czVersionNumber[16] = { "Build 18.07.14" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; +CHAR16 zRevisionNumber[16] = { L"Revision 8577" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/GameVersion.h b/GameVersion.h index 67c728ca..b2257670 100644 --- a/GameVersion.h +++ b/GameVersion.h @@ -14,6 +14,7 @@ extern "C" { extern CHAR16 zVersionLabel[256]; extern CHAR8 czVersionNumber[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? diff --git a/MainMenuScreen.cpp b/MainMenuScreen.cpp index 6bd1583c..be1b7489 100644 --- a/MainMenuScreen.cpp +++ b/MainMenuScreen.cpp @@ -105,7 +105,7 @@ extern void InitSightRange(); //lal 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("Tracking #: %S", zTrackingNumber )); diff --git a/Standard Gaming Platform/ExceptionHandling.cpp b/Standard Gaming Platform/ExceptionHandling.cpp index 495d0e9a..5e8ff996 100644 --- a/Standard Gaming Platform/ExceptionHandling.cpp +++ b/Standard Gaming Platform/ExceptionHandling.cpp @@ -101,7 +101,7 @@ INT32 RecordExceptionInfo( EXCEPTION_POINTERS *pExceptInfo ) #ifdef JA2 //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 ErrorLog( hFile, zNewLine ); @@ -1597,4 +1597,4 @@ void ERLogModules(HWFILE fdump) #endif } -#endif +#endif diff --git a/jascreens.cpp b/jascreens.cpp index fe1d0fb6..cb42d6bc 100644 --- a/jascreens.cpp +++ b/jascreens.cpp @@ -386,9 +386,9 @@ UINT32 InitScreenHandle(void) //mprintf( 10, 420, zVersionLabel ); #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 - 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 #if defined JA2BETAVERSION