diff options
| author | Eugene Sandulenko | 2013-10-01 00:12:04 +0300 | 
|---|---|---|
| committer | Eugene Sandulenko | 2013-10-01 00:12:04 +0300 | 
| commit | f2be180c2a89fce3c3a409df71a1ce260d4ea839 (patch) | |
| tree | c7a00293ddf6ec12875a00cf9b277147d2063dd2 | |
| parent | 17df6b343a0fdb2168b4d3a22927cd0f584ce735 (diff) | |
| download | scummvm-rg350-f2be180c2a89fce3c3a409df71a1ce260d4ea839.tar.gz scummvm-rg350-f2be180c2a89fce3c3a409df71a1ce260d4ea839.tar.bz2 scummvm-rg350-f2be180c2a89fce3c3a409df71a1ce260d4ea839.zip  | |
FULLPIPE: Fix compiler warnings (for good)
| -rw-r--r-- | engines/fullpipe/gfx.h | 4 | ||||
| -rw-r--r-- | engines/fullpipe/sound.h | 6 | 
2 files changed, 7 insertions, 3 deletions
diff --git a/engines/fullpipe/gfx.h b/engines/fullpipe/gfx.h index 1f7284a6eb..85b5998da6 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 ea6987aae6..205f8f3e46 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; }  | 
