libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 13:50:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KYRA: (EOB) - fix warning about overloaded virtual function being only partially overridden

Browse Source
This commit is contained in:
athrxx 2011-12-29 16:56:56 +01:00
parent b4baac065d
commit ef3b591b28
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/kyra/darkmoon.h
View File

@ -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);

1
engines/kyra/eob.h
View File

@ -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);

4
engines/kyra/eobcommon.h
View File

@ -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);