diff options
| author | athrxx | 2011-12-27 13:52:19 +0100 |
|---|---|---|
| committer | athrxx | 2011-12-28 00:01:26 +0100 |
| commit | 4fef4743fd5a2000a96c55c7b961d60e53562504 (patch) | |
| tree | 46cb15c33eafc823b8f2f28b4176cdd967efa58c /engines | |
| parent | 536abf6d3de82f67342d73eefea7b63e3172f4d0 (diff) | |
| download | scummvm-rg350-4fef4743fd5a2000a96c55c7b961d60e53562504.tar.gz scummvm-rg350-4fef4743fd5a2000a96c55c7b961d60e53562504.tar.bz2 scummvm-rg350-4fef4743fd5a2000a96c55c7b961d60e53562504.zip | |
KYRA: (EOB) - fix 2 gcc (-Woverloaded-virtual) warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/kyra_rpg.cpp | 2 | ||||
| -rw-r--r-- | engines/kyra/kyra_rpg.h | 2 | ||||
| -rw-r--r-- | engines/kyra/text_rpg.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp index a4c92b6125..92aa12bc7a 100644 --- a/engines/kyra/kyra_rpg.cpp +++ b/engines/kyra/kyra_rpg.cpp @@ -313,7 +313,7 @@ uint16 KyraRpgEngine::processDialogue() { return res; } -void KyraRpgEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop) { +void KyraRpgEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop, bool) { uint32 curTime = _system->getMillis(); if (time > curTime) delay(time - curTime, doUpdate, isMainLoop); diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h index 1a5acb8e63..678f8120b5 100644 --- a/engines/kyra/kyra_rpg.h +++ b/engines/kyra/kyra_rpg.h @@ -304,7 +304,7 @@ protected: // misc virtual void delay(uint32 millis, bool doUpdate = false, bool isMainLoop = false) = 0; - void delayUntil(uint32 time, bool doUpdate = false, bool isMainLoop = false); + void delayUntil(uint32 time, bool doUpdate = false, bool isMainLoop = false, bool unused = false); int rollDice(int times, int pips, int inc = 0); virtual Common::Error loadGameState(int slot) = 0; diff --git a/engines/kyra/text_rpg.h b/engines/kyra/text_rpg.h index 8ef8fdd0ca..5ad8899484 100644 --- a/engines/kyra/text_rpg.h +++ b/engines/kyra/text_rpg.h @@ -37,7 +37,7 @@ public: TextDisplayer_rpg(KyraRpgEngine *engine, Screen *scr); virtual ~TextDisplayer_rpg(); - virtual void setupField(int dim, bool mode); + void setupField(int dim, bool mode); void printDialogueText(int stringId, const char *pageBreakString); void printDialogueText(const char *str, bool wait = false); |