diff options
author | Florian Kagerer | 2009-03-08 03:26:21 +0000 |
---|---|---|
committer | Florian Kagerer | 2009-03-08 03:26:21 +0000 |
commit | edc18a22994cbbe5b497d847440d0fc3cb776ac5 (patch) | |
tree | c8455bc0a8c55feb2c9bdf5c55f1e6ea365836c2 /engines/kyra/timer.cpp | |
parent | e23fd08dfbdac9d6eedb78813d3504eeccba31a5 (diff) | |
download | scummvm-rg350-edc18a22994cbbe5b497d847440d0fc3cb776ac5.tar.gz scummvm-rg350-edc18a22994cbbe5b497d847440d0fc3cb776ac5.tar.bz2 scummvm-rg350-edc18a22994cbbe5b497d847440d0fc3cb776ac5.zip |
LOL: some opcodes for the library room (so that the game will at least not freeze when clicking one of the books)
svn-id: r39210
Diffstat (limited to 'engines/kyra/timer.cpp')
-rw-r--r-- | engines/kyra/timer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index c3ebad852a..fb22854b94 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -228,10 +228,10 @@ void TimerManager::pauseSingleTimer(uint8 id, bool p) { if (p) { timer->pauseStartTime = _system->getMillis(); - timer->enabled ^= 2; + timer->enabled |= 2; } else if (timer->pauseStartTime) { int32 elapsedTime = _system->getMillis() - timer->pauseStartTime; - timer->enabled ^= 2; + timer->enabled &= (~2); timer->lastUpdate += elapsedTime; timer->nextRun += elapsedTime; resync(); @@ -265,7 +265,7 @@ void TimerManager::disable(uint8 id) { Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id)); if (timer != _timers.end()) - timer->enabled &= 2; + timer->enabled &= (~1); else warning("TimerManager::disable: No timer %d", id); } |