aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/commands.cpp
diff options
context:
space:
mode:
authorDavid Corrales2007-08-05 19:34:20 +0000
committerDavid Corrales2007-08-05 19:34:20 +0000
commit6856535010bd2fa4449bcfde1c88dc06cd46e26f (patch)
treeb81a2234c2beff0312c93e039d6cafda4babeca6 /engines/parallaction/commands.cpp
parent1400d28bfb37fc94f3c44dec0a4d0cef65fb8fb7 (diff)
parentec1803f838d5efc7decf75c05a1fb4a9633751e5 (diff)
downloadscummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.gz
scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.tar.bz2
scummvm-rg350-6856535010bd2fa4449bcfde1c88dc06cd46e26f.zip
Merged fsnode with trunk: r27971:28460
svn-id: r28462
Diffstat (limited to 'engines/parallaction/commands.cpp')
-rw-r--r--engines/parallaction/commands.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/parallaction/commands.cpp b/engines/parallaction/commands.cpp
index 15acdd2d86..dc392fde2c 100644
--- a/engines/parallaction/commands.cpp
+++ b/engines/parallaction/commands.cpp
@@ -274,6 +274,9 @@ void Parallaction::runCommands(CommandList& list, Zone *z) {
case CMD_CLOSE: // close
u->_zone->_flags |= kFlagsClosed;
+ if (u->_zone->u.door->_cnv) {
+ addJob(&jobToggleDoor, (void*)u->_zone, kPriority18 );
+ }
break;
case CMD_ON: // on
@@ -302,7 +305,7 @@ void Parallaction::runCommands(CommandList& list, Zone *z) {
break;
case CMD_CALL: // call
- _callables[u->_callable](z);
+ callFunction(u->_callable, z);
break;
case CMD_QUIT: // quit
@@ -314,7 +317,7 @@ void Parallaction::runCommands(CommandList& list, Zone *z) {
continue;
}
- WalkNodeList *vC = _vm->_char._builder.buildPath(u->_move._x, u->_move._y);
+ WalkNodeList *vC = _char._builder.buildPath(u->_move._x, u->_move._y);
addJob(&jobWalk, vC, kPriority19 );
_engineFlags |= kEngineWalking;