[Scummvm-git-logs] scummvm master -> 3eb7a65b0d4c237c63b3061fc398da23b53bc9a2

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3eb7a65b0d SAGA2: Remove Unused Version Defines and Simplify About String


Commit: 3eb7a65b0d4c237c63b3061fc398da23b53bc9a2
    https://github.com/scummvm/scummvm/commit/3eb7a65b0d4c237c63b3061fc398da23b53bc9a2
Author: D G Turner (digitall at scummvm.org)
Date: 2022-03-30T23:29:40+01:00

Commit Message:
SAGA2: Remove Unused Version Defines and Simplify About String

This removes a bunch of GCC warnings emitted when -Wundef is set.

This also avoids possible future issues by removing the date / time
define usage from about string used within the program about dialog.

This could be replaced by OSystem getTimeAndDate() or gScummVMBuildDate
if needed.

Changed paths:
    engines/saga2/uidialog.cpp
    engines/saga2/version.h


diff --git a/engines/saga2/uidialog.cpp b/engines/saga2/uidialog.cpp
index 5b7e86cb9d5..ac51b3c4710 100644
--- a/engines/saga2/uidialog.cpp
+++ b/engines/saga2/uidialog.cpp
@@ -45,10 +45,6 @@
 
 namespace Saga2 {
 
-#define PROGRAM_ABOUT   PROGRAM_FULL_NAME "\r\n\r\n"\
-	" Version " VERSION_STAMP "\r\n"
-
-
 // dialog functions
 APPFUNC(cmdDialogQuit);
 APPFUNCV(cmdFileSave);
diff --git a/engines/saga2/version.h b/engines/saga2/version.h
index dc7fc7ffe94..7566477d9fa 100644
--- a/engines/saga2/version.h
+++ b/engines/saga2/version.h
@@ -28,23 +28,11 @@
 
 namespace Saga2 {
 
-#define VERSINT_MAJOR 1
-#define VERSINT_MINOR 00
-#define VERSINT_LEVEL 02   // 1=ALPHA 2=BETA 3=GREEN 4=GOLD/RC 5=RELEASE
-#define VERSINT_BUILD 28
 #define VERSION_MAJOR "1"
 #define VERSION_MINOR "00"
 #define VERSION_LEVEL "02"   // 1=ALPHA 2=BETA 3=GREEN 4=GOLD/RC 5=RELEASE
 #define VERSION_BUILD "28"
 
-#if DEBUG
-#define VERSION_DEBUG " ("__DATE__"@"__TIME__")"
-#define VERSION_DISTRIB "For internal distribution only"
-#else
-#define VERSION_DEBUG
-#define VERSION_DISTRIB "General distribution"
-#endif
-
 #ifdef __WATCOMC__
 #define VERSION_OPSYS "DOS"
 #else
@@ -55,11 +43,7 @@ namespace Saga2 {
     Target variables
  * ===================================================================== */
 
-#define VERSINT_SHOWN VERSINT_MAJOR,VERSINT_MINOR
-#define VERSINT_STAMP VERSINT_MAJOR,VERSINT_MINOR,VERSINT_LEVEL,VERSINT_BUILD
-#define VERSION_SHOWN VERSION_MAJOR "." VERSION_MINOR "\0"
-#define VERSION_STAMP VERSION_MAJOR "." VERSION_MINOR "." VERSION_LEVEL "." VERSION_BUILD VERSION_DEBUG "\0"
-#define VERSION_NOTES VERSION_DISTRIB
+#define VERSION_STAMP VERSION_MAJOR "." VERSION_MINOR "." VERSION_LEVEL "." VERSION_BUILD "\0"
 
 } // end of namespace Saga2