[Scummvm-cvs-logs] scummvm master -> aab55c24fd1e1dd757e0d7b735f31662de871e70
bluegr
bluegr at gmail.com
Tue Oct 1 00:05:07 CEST 2013
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
aab55c24fd FULLPIPE: Fix compilation with MSVC
Commit: aab55c24fd1e1dd757e0d7b735f31662de871e70
https://github.com/scummvm/scummvm/commit/aab55c24fd1e1dd757e0d7b735f31662de871e70
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-09-30T15:04:25-07:00
Commit Message:
FULLPIPE: Fix compilation with MSVC
Return a fake value for functions that are supposed to return a boolean value
Changed paths:
engines/fullpipe/gfx.h
engines/fullpipe/sound.h
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h
index 85b5998..9d5c45d 100644
--- a/engines/fullpipe/gfx.h
+++ b/engines/fullpipe/gfx.h
@@ -158,7 +158,7 @@ class PictureObject : public GameObject {
PictureObject(PictureObject *src);
virtual bool load(MfcArchive &file, bool bigPicture);
- virtual bool load(MfcArchive &file) { assert(0); } // Disable base class
+ virtual bool load(MfcArchive &file) { assert(0); return false; } // Disable base class
Common::Point *getDimensions(Common::Point *p);
void draw();
diff --git a/engines/fullpipe/sound.h b/engines/fullpipe/sound.h
index 205f8f3..e2b271f 100644
--- a/engines/fullpipe/sound.h
+++ b/engines/fullpipe/sound.h
@@ -36,7 +36,7 @@ class Sound : public MemoryObject {
public:
Sound();
virtual bool load(MfcArchive &file, NGIArchive *archive);
- virtual bool load(MfcArchive &file) { assert(0); } // Disable base class
+ virtual bool load(MfcArchive &file) { assert(0); return false; } // Disable base class
void updateVolume();
void setPanAndVolumeByStaticAni();
@@ -50,7 +50,7 @@ class SoundList : public CObject {
public:
SoundList();
virtual bool load(MfcArchive &file, char *fname);
- virtual bool load(MfcArchive &file) { assert(0); } // Disable base class
+ virtual bool load(MfcArchive &file) { assert(0); return false; } // Disable base class
bool loadFile(const char *fname, char *libname);
int getCount() { return _soundItemsCount; }
More information about the Scummvm-git-logs
mailing list