[Scummvm-cvs-logs] scummvm master -> f2be180c2a89fce3c3a409df71a1ce260d4ea839

[sev-]

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:
f2be180c2a FULLPIPE: Fix compiler warnings (for good)


Commit: f2be180c2a89fce3c3a409df71a1ce260d4ea839
    https://github.com/scummvm/scummvm/commit/f2be180c2a89fce3c3a409df71a1ce260d4ea839
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-09-30T14:12:04-07:00

Commit Message:
FULLPIPE: Fix compiler warnings (for good)

Changed paths:
    engines/fullpipe/gfx.h
    engines/fullpipe/sound.h



diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h
index 1f7284a..85b5998 100644
--- a/engines/fullpipe/gfx.h
+++ b/engines/fullpipe/gfx.h
@@ -157,7 +157,9 @@ class PictureObject : public GameObject {
 	PictureObject();
 	PictureObject(PictureObject *src);
 
-	bool load(MfcArchive &file, bool bigPicture);
+	virtual bool load(MfcArchive &file, bool bigPicture);
+	virtual bool load(MfcArchive &file) { assert(0); } // Disable base class
+
 	Common::Point *getDimensions(Common::Point *p);
 	void draw();
 	void drawAt(int x, int y);
diff --git a/engines/fullpipe/sound.h b/engines/fullpipe/sound.h
index ea6987a..205f8f3 100644
--- a/engines/fullpipe/sound.h
+++ b/engines/fullpipe/sound.h
@@ -35,7 +35,8 @@ class Sound : public MemoryObject {
 
   public:
 	Sound();
-	bool load(MfcArchive &file, NGIArchive *archive);
+	virtual bool load(MfcArchive &file, NGIArchive *archive);
+	virtual bool load(MfcArchive &file) { assert(0); } // Disable base class
 	void updateVolume();
 
 	void setPanAndVolumeByStaticAni();
@@ -48,7 +49,8 @@ class SoundList : public CObject {
 
  public:
 	SoundList();
-	bool load(MfcArchive &file, char *fname);
+	virtual bool load(MfcArchive &file, char *fname);
+	virtual bool load(MfcArchive &file) { assert(0); } // Disable base class
 	bool loadFile(const char *fname, char *libname);
 
 	int getCount() { return _soundItemsCount; }