aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorathrxx2012-01-03 21:30:45 +0100
committerunknown2012-01-06 14:44:34 +0100
commit6e45741b17ec17ec1c2081557df043d5d4f2ff73 (patch)
treeff5721b2f21f6d932a08641c8e645f2caee477dc /engines
parent43e2fde7a951d362ab06f20bc043698f0e1e47c3 (diff)
downloadscummvm-rg350-6e45741b17ec17ec1c2081557df043d5d4f2ff73.tar.gz
scummvm-rg350-6e45741b17ec17ec1c2081557df043d5d4f2ff73.tar.bz2
scummvm-rg350-6e45741b17ec17ec1c2081557df043d5d4f2ff73.zip
KYRA: (EOB) - cleanup eob/lol version of delayUntil()
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/eobcommon.cpp2
-rw-r--r--engines/kyra/kyra_rpg.cpp2
-rw-r--r--engines/kyra/kyra_rpg.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/eobcommon.cpp b/engines/kyra/eobcommon.cpp
index 4f169acabf..c7d8ed566f 100644
--- a/engines/kyra/eobcommon.cpp
+++ b/engines/kyra/eobcommon.cpp
@@ -347,7 +347,7 @@ void EoBCoreEngine::initKeymap() {
Common::Action *const act = new Common::Action(engineKeyMap, keyActionEntries[i].id, keyActionEntries[i].description, Common::kGenericActionType, Common::kActionKeyType);
act->addKeyEvent(keyActionEntries[i].ks);
}
-
+
if (_flags.gameID == GI_EOB2) {
Common::Action *const act = new Common::Action(engineKeyMap, "SL6", _("Spell Level 6"), Common::kGenericActionType, Common::kActionKeyType);
act->addKeyEvent(Common::KeyState(Common::KEYCODE_6));
diff --git a/engines/kyra/kyra_rpg.cpp b/engines/kyra/kyra_rpg.cpp
index 4487290bf9..b8d56b3ecb 100644
--- a/engines/kyra/kyra_rpg.cpp
+++ b/engines/kyra/kyra_rpg.cpp
@@ -308,7 +308,7 @@ uint16 KyraRpgEngine::processDialogue() {
return res;
}
-void KyraRpgEngine::delayUntil(uint32 time, bool doUpdate, bool isMainLoop, bool) {
+void KyraRpgEngine::delayUntil(uint32 time, bool, bool doUpdate, bool isMainLoop) {
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 24c19105d9..a1b9b4c332 100644
--- a/engines/kyra/kyra_rpg.h
+++ b/engines/kyra/kyra_rpg.h
@@ -331,7 +331,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, bool unused = false);
+ void delayUntil(uint32 time, bool unused = false, bool doUpdate = false, bool isMainLoop = false);
int rollDice(int times, int pips, int inc = 0);
virtual Common::Error loadGameState(int slot) = 0;