From 4de9d25f048441e3d4b64245f53e56a09779634e Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sat, 9 Apr 2016 18:58:34 +0200 Subject: [PATCH] Man, those compile errors... --- src/app/app.cpp | 2 +- src/level/parser/parserparam.cpp | 4 ---- src/level/parser/parserparam.h | 1 - src/level/robotmain.cpp | 2 +- src/ui/screen/screen_player_select.cpp | 4 +--- 5 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/app/app.cpp b/src/app/app.cpp index 5cc047a5..c1439ff1 100644 --- a/src/app/app.cpp +++ b/src/app/app.cpp @@ -1823,7 +1823,7 @@ void CApplication::SetLanguage(Language language) // Update C++ locale try { - std::locale::global(std::locale(systemLocale)); + std::locale::global(std::locale(systemLocale.c_str())); } catch (...) { diff --git a/src/level/parser/parserparam.cpp b/src/level/parser/parserparam.cpp index 82e6e494..317d388b 100644 --- a/src/level/parser/parserparam.cpp +++ b/src/level/parser/parserparam.cpp @@ -50,10 +50,6 @@ CLevelParserParam::CLevelParserParam(int value) : m_value(boost::lexical_cast(value)) {} -CLevelParserParam::CLevelParserParam(long value) - : m_value(boost::lexical_cast(value)) -{} - CLevelParserParam::CLevelParserParam(float value) : m_value(boost::lexical_cast(value)) {} diff --git a/src/level/parser/parserparam.h b/src/level/parser/parserparam.h index 55a2f444..f620d845 100644 --- a/src/level/parser/parserparam.h +++ b/src/level/parser/parserparam.h @@ -54,7 +54,6 @@ public: //! Create param with given value //@{ CLevelParserParam(int value); - CLevelParserParam(long value); CLevelParserParam(float value); CLevelParserParam(std::string value); CLevelParserParam(bool value); diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index e1fb2392..9104f3b2 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -4656,7 +4656,7 @@ bool CRobotMain::IOWriteScene(std::string filename, std::string filecbot, std::s line = MakeUnique("Created"); - line->AddParam("date", MakeUnique(time(nullptr))); + line->AddParam("date", MakeUnique(static_cast(time(nullptr)))); levelParser.AddLine(std::move(line)); line = MakeUnique("Mission"); diff --git a/src/ui/screen/screen_player_select.cpp b/src/ui/screen/screen_player_select.cpp index 9c707d70..678f8286 100644 --- a/src/ui/screen/screen_player_select.cpp +++ b/src/ui/screen/screen_player_select.cpp @@ -370,9 +370,6 @@ bool CScreenPlayerSelect::NameCreate() { CWindow* pw; CEdit* pe; - char name[100]; - char c; - int len, i, j; GetLogger()->Info("Creating new player\n"); pw = static_cast(m_interface->SearchControl(EVENT_WINDOW5)); @@ -380,6 +377,7 @@ bool CScreenPlayerSelect::NameCreate() pe = static_cast(pw->SearchControl(EVENT_INTERFACE_NEDIT)); if ( pe == nullptr ) return false; + char name[100]; pe->GetText(name, 100); if ( name[0] == 0 ) {