aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukaslw2014-03-11 17:10:11 +0100
committerlukaslw2014-04-28 21:49:34 +0200
commitad842e61da920952e1583c7d88e252fac43e4f6c (patch)
tree332592f61263182604666a4a1d07627f38e0f078
parentb3de0843a9cd66e133a33b467da1f6ba1a572db9 (diff)
downloadscummvm-rg350-ad842e61da920952e1583c7d88e252fac43e4f6c.tar.gz
scummvm-rg350-ad842e61da920952e1583c7d88e252fac43e4f6c.tar.bz2
scummvm-rg350-ad842e61da920952e1583c7d88e252fac43e4f6c.zip
DRACI: Inventory opening after finished callback.
-rw-r--r--engines/draci/game.cpp2
-rw-r--r--engines/draci/walking.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index b98593c8a4..4893b0fe34 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -1218,7 +1218,7 @@ void Game::walkHero(int x, int y, SightDirection dir) {
}
// Save point of player's last target.
- if(_loopStatus != kStatusInventory) {
+ if (_loopStatus != kStatusInventory) {
_lastTarget = target;
}
diff --git a/engines/draci/walking.cpp b/engines/draci/walking.cpp
index 1670c9a029..6914898ec1 100644
--- a/engines/draci/walking.cpp
+++ b/engines/draci/walking.cpp
@@ -452,6 +452,8 @@ void WalkingState::callback() {
const GPL2Program &originalCallback = *_callback;
_callback = NULL;
_vm->_script->runWrapper(originalCallback, _callbackOffset, true, false);
+ _callbackLast = NULL;
+ _callbackOffset = NULL;
}
void WalkingState::callbackLast() {