[Scummvm-git-logs] scummvm master -> 64c88d4c4fd069dae321cc576259ef88a7cb2b78

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
64c88d4c4f XEEN: Implement do nothing opcode


Commit: 64c88d4c4fd069dae321cc576259ef88a7cb2b78
    https://github.com/scummvm/scummvm/commit/64c88d4c4fd069dae321cc576259ef88a7cb2b78
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2017-11-18T20:23:37-05:00

Commit Message:
XEEN: Implement do nothing opcode

Changed paths:
    engines/xeen/scripts.cpp


diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index e5af78b..2198689 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,