Man, those compile errors...

master
krzys-h 2016-04-09 18:58:34 +02:00
parent 32af7f45df
commit 4de9d25f04
5 changed files with 3 additions and 10 deletions

View File

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

View File

@ -50,10 +50,6 @@ CLevelParserParam::CLevelParserParam(int value)
: m_value(boost::lexical_cast<std::string>(value))
{}
CLevelParserParam::CLevelParserParam(long value)
: m_value(boost::lexical_cast<std::string>(value))
{}
CLevelParserParam::CLevelParserParam(float value)
: m_value(boost::lexical_cast<std::string>(value))
{}

View File

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

View File

@ -4656,7 +4656,7 @@ bool CRobotMain::IOWriteScene(std::string filename, std::string filecbot, std::s
line = MakeUnique<CLevelParserLine>("Created");
line->AddParam("date", MakeUnique<CLevelParserParam>(time(nullptr)));
line->AddParam("date", MakeUnique<CLevelParserParam>(static_cast<int>(time(nullptr))));
levelParser.AddLine(std::move(line));
line = MakeUnique<CLevelParserLine>("Mission");

View File

@ -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<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5));
@ -380,6 +377,7 @@ bool CScreenPlayerSelect::NameCreate()
pe = static_cast<CEdit*>(pw->SearchControl(EVENT_INTERFACE_NEDIT));
if ( pe == nullptr ) return false;
char name[100];
pe->GetText(name, 100);
if ( name[0] == 0 )
{