Show game version in logs, closes #413

dev-mp
krzys-h 2014-12-11 19:59:24 +01:00
parent 601a58ea31
commit 5948a9e9d8
6 changed files with 3 additions and 9 deletions

View File

@ -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");

View File

@ -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) {

View File

@ -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@"

View File

@ -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");

View File

@ -50,7 +50,6 @@ enum ResType
*/
enum ResTextType
{
RT_VERSION_ID = 1,
RT_DISINFO_TITLE = 2,
RT_WINDOW_MAXIMIZED = 3,
RT_WINDOW_MINIMIZED = 4,

View File

@ -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);