immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor MSVC compilation fixes

master
Piotr Dziwinski 2015-04-27 18:16:37 +02:00
parent fcd904faf7
commit 544e513148
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/resources/sndfile.cpp
View File

@ -27,8 +27,8 @@ CSNDFile::CSNDFile(const std::string& filename)
, m_snd_file{nullptr} , m_snd_file{nullptr}
, m_file{nullptr} , m_file{nullptr}
, m_last_error{} , m_last_error{}
, m_snd_callbacks{SNDLength, SNDSeek, SNDRead, SNDWrite, SNDTell}
{ {
m_snd_callbacks = { SNDLength, SNDSeek, SNDRead, SNDWrite, SNDTell };
if (PHYSFS_isInit()) if (PHYSFS_isInit())
{ {
m_file = PHYSFS_openRead(filename.c_str()); m_file = PHYSFS_openRead(filename.c_str());

2
src/script/scriptfunc.cpp
View File

@ -356,7 +356,7 @@ bool CScriptFunctions::rEndMission(CBotVar* var, CBotVar* result, int& exception
Error ended; Error ended;
float delay; float delay;
ended = static_cast<Error>(var->GetValFloat()); ended = static_cast<Error>(static_cast<int>(var->GetValFloat())); // TODO: is this correct?!
var = var->GetNext(); var = var->GetNext();
delay = var->GetValFloat(); delay = var->GetValFloat();