Man, those compile errors...
parent
32af7f45df
commit
4de9d25f04
|
@ -1823,7 +1823,7 @@ void CApplication::SetLanguage(Language language)
|
||||||
// Update C++ locale
|
// Update C++ locale
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
std::locale::global(std::locale(systemLocale));
|
std::locale::global(std::locale(systemLocale.c_str()));
|
||||||
}
|
}
|
||||||
catch (...)
|
catch (...)
|
||||||
{
|
{
|
||||||
|
|
|
@ -50,10 +50,6 @@ CLevelParserParam::CLevelParserParam(int value)
|
||||||
: m_value(boost::lexical_cast<std::string>(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)
|
CLevelParserParam::CLevelParserParam(float value)
|
||||||
: m_value(boost::lexical_cast<std::string>(value))
|
: m_value(boost::lexical_cast<std::string>(value))
|
||||||
{}
|
{}
|
||||||
|
|
|
@ -54,7 +54,6 @@ public:
|
||||||
//! Create param with given value
|
//! Create param with given value
|
||||||
//@{
|
//@{
|
||||||
CLevelParserParam(int value);
|
CLevelParserParam(int value);
|
||||||
CLevelParserParam(long value);
|
|
||||||
CLevelParserParam(float value);
|
CLevelParserParam(float value);
|
||||||
CLevelParserParam(std::string value);
|
CLevelParserParam(std::string value);
|
||||||
CLevelParserParam(bool value);
|
CLevelParserParam(bool value);
|
||||||
|
|
|
@ -4656,7 +4656,7 @@ bool CRobotMain::IOWriteScene(std::string filename, std::string filecbot, std::s
|
||||||
|
|
||||||
|
|
||||||
line = MakeUnique<CLevelParserLine>("Created");
|
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));
|
levelParser.AddLine(std::move(line));
|
||||||
|
|
||||||
line = MakeUnique<CLevelParserLine>("Mission");
|
line = MakeUnique<CLevelParserLine>("Mission");
|
||||||
|
|
|
@ -370,9 +370,6 @@ bool CScreenPlayerSelect::NameCreate()
|
||||||
{
|
{
|
||||||
CWindow* pw;
|
CWindow* pw;
|
||||||
CEdit* pe;
|
CEdit* pe;
|
||||||
char name[100];
|
|
||||||
char c;
|
|
||||||
int len, i, j;
|
|
||||||
|
|
||||||
GetLogger()->Info("Creating new player\n");
|
GetLogger()->Info("Creating new player\n");
|
||||||
pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5));
|
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));
|
pe = static_cast<CEdit*>(pw->SearchControl(EVENT_INTERFACE_NEDIT));
|
||||||
if ( pe == nullptr ) return false;
|
if ( pe == nullptr ) return false;
|
||||||
|
|
||||||
|
char name[100];
|
||||||
pe->GetText(name, 100);
|
pe->GetText(name, 100);
|
||||||
if ( name[0] == 0 )
|
if ( name[0] == 0 )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue