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

GCC 4.6 compilation fixes

dev-mp
Piotr Dziwinski 2014-10-07 23:25:37 +02:00
parent 12feb49098
commit 342210b062
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,9 +20,12 @@
CSNDFile::CSNDFile(const std::string& filename) CSNDFile::CSNDFile(const std::string& filename)
: m_file_info{}
, m_snd_file{nullptr}
, m_file{nullptr}
, m_last_error{}
, m_snd_callbacks{SNDLength, SNDSeek, SNDRead, SNDWrite, SNDTell}
{ {
memset(&m_file_info, 0, sizeof(SF_INFO));
if (PHYSFS_isInit()) if (PHYSFS_isInit())
{ {
m_file = PHYSFS_openRead(filename.c_str()); m_file = PHYSFS_openRead(filename.c_str());
@ -33,7 +36,7 @@ CSNDFile::CSNDFile(const std::string& filename)
} }
if (m_file) if (m_file)
{ {
m_snd_file = sf_open_virtual(&snd_callbacks, SFM_READ, &m_file_info, m_file); m_snd_file = sf_open_virtual(&m_snd_callbacks, SFM_READ, &m_file_info, m_file);
if (!m_snd_file) if (!m_snd_file)
{ {
m_last_error = "Could not load file"; m_last_error = "Could not load file";

9
src/common/resources/sndfile.h
View File

@ -42,12 +42,5 @@ private:
SNDFILE *m_snd_file; SNDFILE *m_snd_file;
PHYSFS_File *m_file; PHYSFS_File *m_file;
std::string m_last_error; std::string m_last_error;
SF_VIRTUAL_IO m_snd_callbacks;
SF_VIRTUAL_IO snd_callbacks = {
SNDLength,
SNDSeek,
SNDRead,
SNDWrite,
SNDTell
};
}; };

5
src/object/level/parserexceptions.h
View File

@ -30,8 +30,9 @@ class CLevelParserException : public std::exception
{ {
public: public:
CLevelParserException(std::string message) noexcept; CLevelParserException(std::string message) noexcept;
virtual ~CLevelParserException() noexcept {}
const char* what() const noexcept; const char* what() const noexcept;
protected: protected:
std::string m_message; std::string m_message;
}; };
@ -40,10 +41,12 @@ class CLevelParserExceptionMissingParam : public CLevelParserException
{ {
public: public:
CLevelParserExceptionMissingParam(CLevelParserParam* thisParam) noexcept; CLevelParserExceptionMissingParam(CLevelParserParam* thisParam) noexcept;
virtual ~CLevelParserExceptionMissingParam() noexcept {}
}; };
class CLevelParserExceptionBadParam : public CLevelParserException class CLevelParserExceptionBadParam : public CLevelParserException
{ {
public: public:
CLevelParserExceptionBadParam(CLevelParserParam* thisParam, std::string requestedType) noexcept; CLevelParserExceptionBadParam(CLevelParserParam* thisParam, std::string requestedType) noexcept;
virtual ~CLevelParserExceptionBadParam() noexcept {}
}; };