[colobot] 333/390: Minor MSVC compilation fixes

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit 544e513148b0e8b03059a3ac2d5414d59547f4f2
Author: Piotr Dziwinski <piotrdz at gmail.com>
Date:   Mon Apr 27 18:16:37 2015 +0200

    Minor MSVC compilation fixes
---
 src/common/resources/sndfile.cpp | 2 +-
 src/script/scriptfunc.cpp        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/resources/sndfile.cpp b/src/common/resources/sndfile.cpp
index d2330e1..e7e2f4c 100644
--- a/src/common/resources/sndfile.cpp
+++ b/src/common/resources/sndfile.cpp
@@ -27,8 +27,8 @@ CSNDFile::CSNDFile(const std::string& filename)
     , m_snd_file{nullptr}
     , m_file{nullptr}
     , m_last_error{}
-    , m_snd_callbacks{SNDLength, SNDSeek, SNDRead, SNDWrite, SNDTell}
 {
+    m_snd_callbacks = { SNDLength, SNDSeek, SNDRead, SNDWrite, SNDTell };
     if (PHYSFS_isInit())
     {
         m_file = PHYSFS_openRead(filename.c_str());
diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp
index 9d3b8bf..77c622c 100644
--- a/src/script/scriptfunc.cpp
+++ b/src/script/scriptfunc.cpp
@@ -356,7 +356,7 @@ bool CScriptFunctions::rEndMission(CBotVar* var, CBotVar* result, int& exception
     Error ended;
     float delay;
     
-    ended = static_cast<Error>(var->GetValFloat());
+    ended = static_cast<Error>(static_cast<int>(var->GetValFloat())); // TODO: is this correct?!
     var = var->GetNext();
     
     delay = var->GetValFloat();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git