diff options
author | athrxx | 2011-12-29 16:56:56 +0100 |
---|---|---|
committer | athrxx | 2011-12-29 19:12:36 +0100 |
commit | ef3b591b289136194cec9f8a209ff2645c98b576 (patch) | |
tree | 0eaa0356904bb414556b3f4bb234790c1ea2caa2 /engines | |
parent | b4baac065df70999ed08017c89166f0fbe6164ea (diff) | |
download | scummvm-rg350-ef3b591b289136194cec9f8a209ff2645c98b576.tar.gz scummvm-rg350-ef3b591b289136194cec9f8a209ff2645c98b576.tar.bz2 scummvm-rg350-ef3b591b289136194cec9f8a209ff2645c98b576.zip |
KYRA: (EOB) - fix warning about overloaded virtual function being only partially overridden
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/darkmoon.h | 1 | ||||
-rw-r--r-- | engines/kyra/eob.h | 1 | ||||
-rw-r--r-- | engines/kyra/eobcommon.h | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/engines/kyra/darkmoon.h b/engines/kyra/darkmoon.h index 8abbc2bea2..78413d2c38 100644 --- a/engines/kyra/darkmoon.h +++ b/engines/kyra/darkmoon.h @@ -111,6 +111,7 @@ private: bool killMonsterExtra(EoBMonsterInPlay *m); // Level + void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {} const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs); void drawDoorIntern(int type, int, int x, int y, int w, int wall, int mDim, int16, int16); diff --git a/engines/kyra/eob.h b/engines/kyra/eob.h index 6123c26726..ce71c76af4 100644 --- a/engines/kyra/eob.h +++ b/engines/kyra/eob.h @@ -112,6 +112,7 @@ private: void updateScriptTimersExtra(); // Level + const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) { return 0; } void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2); void drawDoorIntern(int type, int index, int x, int y, int w, int wall, int mDim, int16 y1, int16 y2); diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h index 9284a181b4..f02b76d267 100644 --- a/engines/kyra/eobcommon.h +++ b/engines/kyra/eobcommon.h @@ -582,8 +582,8 @@ protected: void releaseDecorations(); void releaseDoorShapes(); void toggleWallState(int wall, int flags); - virtual void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) {} - virtual const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8*shapeDefs) { return (const uint8*)filename; } + virtual void loadDoorShapes(int doorType1, int shapeId1, int doorType2, int shapeId2) = 0; + virtual const uint8 *loadDoorShapes(const char *filename, int doorIndex, const uint8 *shapeDefs) = 0; void drawScene(int refresh); void drawSceneShapes(int start = 0); |