diff options
| author | athrxx | 2011-08-06 00:40:53 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 16:18:13 +0100 |
| commit | bac0caeb0ff712fe9002985c44c1ea651b86e018 (patch) | |
| tree | 5fbfbe57957f441f07e7b644ba402fb21c5f1f40 /engines/kyra/timer_eob.cpp | |
| parent | aab9e62247af1c22772bb79821675fbab06c047d (diff) | |
| download | scummvm-rg350-bac0caeb0ff712fe9002985c44c1ea651b86e018.tar.gz scummvm-rg350-bac0caeb0ff712fe9002985c44c1ea651b86e018.tar.bz2 scummvm-rg350-bac0caeb0ff712fe9002985c44c1ea651b86e018.zip | |
KYRA: (EOB) - lots of fixes towards EOB1 playability
also implement some new code (EOB1 portals, burning hands spell, etc.)
Diffstat (limited to 'engines/kyra/timer_eob.cpp')
| -rw-r--r-- | engines/kyra/timer_eob.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/kyra/timer_eob.cpp b/engines/kyra/timer_eob.cpp index 9e03bdebcf..ba4d6a2475 100644 --- a/engines/kyra/timer_eob.cpp +++ b/engines/kyra/timer_eob.cpp @@ -210,7 +210,7 @@ void EobCoreEngine::advanceTimers(uint32 millis) { setupCharacterTimers(); - if (_scriptTimersMode & 2) { + if (_scriptTimersMode & 1) { for (int i = 0; i < _scriptTimersCount; i++) { if (_scriptTimers[i].next > ct) { uint32 chrt = _scriptTimers[i].next - ct; @@ -371,7 +371,7 @@ void EobCoreEngine::timerUpdateTeleporters(int timerNum) { _teleporterPulse ^= 1; for (int i = 0; i < 18; i++) { uint8 w = _visibleBlocks[i]->walls[_sceneDrawVarDown]; - if (w == 44 || w == 74) { + if ((_flags.gameID == GI_EOB1 && w == 52) || (_flags.gameID == GI_EOB2 && (w == 44 || w == 74))) { _sceneUpdateRequired = true; return; } |