[colobot] 238/390: Show game version in logs, closes #413

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit 5948a9e9d8ce55cce55a2ec00b92c914e5007cba
Author: krzys-h <krzys_h at interia.pl>
Date:   Thu Dec 11 19:59:24 2014 +0100

    Show game version in logs, closes #413
---
 src/app/app.cpp           | 2 +-
 src/app/main.cpp          | 2 +-
 src/common/config.h.cmake | 4 +---
 src/common/restext.cpp    | 2 --
 src/common/restext.h      | 1 -
 src/ui/maindialog.cpp     | 1 -
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/app/app.cpp b/src/app/app.cpp
index 4af90e8..22b1511 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -277,7 +277,7 @@ ParseArgsStatus CApplication::ParseArguments(int argc, char *argv[])
             case OPT_HELP:
             {
                 GetLogger()->Message("\n");
-                GetLogger()->Message("Colobot %s (%s)\n", COLOBOT_CODENAME, COLOBOT_VERSION);
+                GetLogger()->Message("%s\n", COLOBOT_FULLNAME);
                 GetLogger()->Message("\n");
                 GetLogger()->Message("List of available options:\n");
                 GetLogger()->Message("  -help               this help\n");
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 88a7a73..03bd507 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -86,7 +86,7 @@ int SDL_MAIN_FUNC(int argc, char *argv[])
     InitializeRestext();
     InitializeEventTypeTexts();
 
-    logger.Info("Colobot starting\n");
+    logger.Info("%s starting\n", COLOBOT_FULLNAME);
     
     int code = 0;
     while(true) {
diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake
index 44c1085..5212502 100644
--- a/src/common/config.h.cmake
+++ b/src/common/config.h.cmake
@@ -26,9 +26,7 @@
 
 #cmakedefine PORTABLE @PORTABLE@
 
-#define COLOBOT_VERSION "@COLOBOT_VERSION_FULL@"
-#define COLOBOT_CODENAME "@COLOBOT_VERSION_CODENAME@"
-#define COLOBOT_FULLNAME "Colobot @COLOBOT_VERSION_CODENAME@"
+#define COLOBOT_FULLNAME "Colobot: Gold Edition @COLOBOT_VERSION_FULL@"
 #define COLOBOT_VERSION_DISPLAY "@COLOBOT_VERSION_DISPLAY@"
 
 #define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@"
diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index 8e5c172..4da3876 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -54,8 +54,6 @@ const char* stringsCbot[TX_MAX]         = { nullptr };
 
 void InitializeRestext()
 {
-    stringsText[RT_VERSION_ID]       = COLOBOT_FULLNAME;
-
     stringsText[RT_DISINFO_TITLE]    = TR("SatCom");
     stringsText[RT_WINDOW_MAXIMIZED] = TR("Maximize");
     stringsText[RT_WINDOW_MINIMIZED] = TR("Minimize");
diff --git a/src/common/restext.h b/src/common/restext.h
index 9aff035..4690605 100644
--- a/src/common/restext.h
+++ b/src/common/restext.h
@@ -50,7 +50,6 @@ enum ResType
  */
 enum ResTextType
 {
-    RT_VERSION_ID           = 1,
     RT_DISINFO_TITLE        = 2,
     RT_WINDOW_MAXIMIZED     = 3,
     RT_WINDOW_MINIMIZED     = 4,
diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp
index 25e2ce8..3e1331a 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -1743,7 +1743,6 @@ void CMainDialog::ChangePhase(Phase phase)
         pos.y  =   9.0f/480.0f;
         ddim.x =  90.0f/640.0f;
         ddim.y =  10.0f/480.0f;
-        //GetResource(RES_TEXT, RT_VERSION_ID, name);
         pl = pw->CreateLabel(pos, ddim, 0, EVENT_LABEL1, COLOBOT_VERSION_DISPLAY);
         pl->SetFontType(Gfx::FONT_COURIER);
         pl->SetFontSize(9.0f);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git