[colobot] 66/145: Man, those compile errors...
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 4de9d25f048441e3d4b64245f53e56a09779634e
Author: krzys-h <krzys_h at interia.pl>
Date: Sat Apr 9 18:58:34 2016 +0200
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 5cc047a..c1439ff 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 82e6e49..317d388 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<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))
{}
diff --git a/src/level/parser/parserparam.h b/src/level/parser/parserparam.h
index 55a2f44..f620d84 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 e1fb239..9104f3b 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<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");
diff --git a/src/ui/screen/screen_player_select.cpp b/src/ui/screen/screen_player_select.cpp
index 9c707d7..678f828 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<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 )
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list