diff options
author | Torbjörn Andersson | 2008-05-10 19:57:49 +0000 |
---|---|---|
committer | Torbjörn Andersson | 2008-05-10 19:57:49 +0000 |
commit | b2defd0eac9401ffeea91ef0154650e108ffc179 (patch) | |
tree | 40429203ae10d7210797ab3be49b070efb44260b /engines | |
parent | d21d9858fd33a56983eb89b662db2b27fead3ce5 (diff) | |
download | scummvm-rg350-b2defd0eac9401ffeea91ef0154650e108ffc179.tar.gz scummvm-rg350-b2defd0eac9401ffeea91ef0154650e108ffc179.tar.bz2 scummvm-rg350-b2defd0eac9401ffeea91ef0154650e108ffc179.zip |
Fixed warning.
svn-id: r31988
Diffstat (limited to 'engines')
-rw-r--r-- | engines/kyra/timer.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/timer.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index d9668afa98..b20d9510cc 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -62,15 +62,15 @@ struct TimerEqual : public Common::UnaryFunction<const TimerEntry&, bool> { }; } // end of anonymous namespace -void TimerManager::pause(bool pause) { - if (pause) { +void TimerManager::pause(bool p) { + if (p) { ++_isPaused; if (_isPaused == 1) { _isPaused = true; _pauseStart = _system->getMillis(); } - } else if (!pause && _isPaused > 0) { + } else if (!p && _isPaused > 0) { --_isPaused; if (_isPaused == 0) { diff --git a/engines/kyra/timer.h b/engines/kyra/timer.h index f668a88015..264590845e 100644 --- a/engines/kyra/timer.h +++ b/engines/kyra/timer.h @@ -52,7 +52,7 @@ public: TimerManager(KyraEngine *vm, OSystem *sys) : _vm(vm), _system(sys), _timers(), _nextRun(0), _isPaused(0), _pauseStart(0) {} ~TimerManager() { reset(); } - void pause(bool pause); + void pause(bool p); void reset(); |