diff options
| author | Paul Gilbert | 2017-11-18 20:23:37 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2017-11-18 20:23:37 -0500 |
| commit | 64c88d4c4fd069dae321cc576259ef88a7cb2b78 (patch) | |
| tree | 7d325e39ab940a7bb3c62c68f8507342b64b3358 /engines/xeen | |
| parent | aa04e311f1b923b6ec8f07e2af1e85cc02dd2a49 (diff) | |
| download | scummvm-rg350-64c88d4c4fd069dae321cc576259ef88a7cb2b78.tar.gz scummvm-rg350-64c88d4c4fd069dae321cc576259ef88a7cb2b78.tar.bz2 scummvm-rg350-64c88d4c4fd069dae321cc576259ef88a7cb2b78.zip | |
XEEN: Implement do nothing opcode
Diffstat (limited to 'engines/xeen')
| -rw-r--r-- | engines/xeen/scripts.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp index e5af78b57d..2198689f32 100644 --- a/engines/xeen/scripts.cpp +++ b/engines/xeen/scripts.cpp @@ -160,7 +160,7 @@ int Scripts::checkEvents() { _eventSkipped = false; uint eventIndex; - for (eventIndex = 0; eventIndex < map._events.size(); ++eventIndex) { + for (eventIndex = 0; eventIndex < map._events.size() && !_vm->shouldQuit(); ++eventIndex) { MazeEvent &event = map._events[eventIndex]; if (event._position == _currentPos && party._mazeDirection != @@ -321,7 +321,7 @@ typedef void(Scripts::*ScriptMethodPtr)(Common::Array<byte> &); void Scripts::doOpcode(MazeEvent &event) { static const ScriptMethodPtr COMMAND_LIST[] = { - nullptr, &Scripts::cmdDisplay1, &Scripts::cmdDoorTextSml, + &Scripts::cmdNoAction, &Scripts::cmdDisplay1, &Scripts::cmdDoorTextSml, &Scripts::cmdDoorTextLrg, &Scripts::cmdSignText, &Scripts::cmdNPC, &Scripts::cmdPlayFX, &Scripts::cmdTeleport, &Scripts::cmdIf, &Scripts::cmdIf, &Scripts::cmdIf, |