diff options
| author | erihel <erihel@gmail.com> | 2012-12-29 13:00:59 +0100 |
|---|---|---|
| committer | erihel <erihel@gmail.com> | 2012-12-29 13:00:59 +0100 |
| commit | 03f232f0f675c3bf7f866d1df9be46820111b5c9 (patch) | |
| tree | cf9810e4298b5927b77062b232b5876f0512eafa /src/common | |
| parent | c9ca8f2b62b4994fa797272aecaf33f23253acae (diff) | |
| parent | e625665f023c64141e247b1056edf138f1a60c60 (diff) | |
| download | colobot-03f232f0f675c3bf7f866d1df9be46820111b5c9.tar.gz colobot-03f232f0f675c3bf7f866d1df9be46820111b5c9.tar.bz2 colobot-03f232f0f675c3bf7f866d1df9be46820111b5c9.zip | |
Merge branch 'dev' of github:colobot/colobot into dev
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/config.h.cmake | 4 | ||||
| -rw-r--r-- | src/common/restext.cpp | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/common/config.h.cmake b/src/common/config.h.cmake index dd280a3..022bb69 100644 --- a/src/common/config.h.cmake +++ b/src/common/config.h.cmake @@ -8,6 +8,10 @@ #cmakedefine USE_GLEW @USE_GLEW@ #cmakedefine GLEW_STATIC +#define COLOBOT_VERSION "@COLOBOT_VERSION_FULL@" +#define COLOBOT_CODENAME "@COLOBOT_VERSION_CODENAME@" +#define COLOBOT_FULLNAME "Colobot @COLOBOT_VERSION_CODENAME@" + #define COLOBOT_DEFAULT_DATADIR "@COLOBOT_INSTALL_DATA_DIR@" #define COLOBOT_I18N_DIR "@COLOBOT_INSTALL_I18N_DIR@" diff --git a/src/common/restext.cpp b/src/common/restext.cpp index da06131..4c56ae5 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -17,6 +17,8 @@ #include "common/restext.h" +#include "common/config.h" + #include "common/global.h" #include "common/event.h" #include "common/logger.h" @@ -39,7 +41,7 @@ const char* stringsCbot[TX_MAX] = { nullptr }; void InitializeRestext() { - stringsText[RT_VERSION_ID] = "Colobot Gold"; + stringsText[RT_VERSION_ID] = COLOBOT_FULLNAME; stringsText[RT_DISINFO_TITLE] = "SatCom"; stringsText[RT_WINDOW_MAXIMIZED] = "Maximize"; |