aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2016-01-07 12:35:05 +0100
committerEugene Sandulenko2016-01-07 12:35:05 +0100
commit9bd51254c6556a6e560af421c29584158bf1ca6a (patch)
treea1edf90fc38c30168aa6e2b5ddfca88e57fb4ae2 /engines
parentf2584488aab4073642ddbf35c50ea8e46bd43a55 (diff)
downloadscummvm-rg350-9bd51254c6556a6e560af421c29584158bf1ca6a.tar.gz
scummvm-rg350-9bd51254c6556a6e560af421c29584158bf1ca6a.tar.bz2
scummvm-rg350-9bd51254c6556a6e560af421c29584158bf1ca6a.zip
WAGE: Process scenes without scripts
Diffstat (limited to 'engines')
-rw-r--r--engines/wage/wage.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/wage/wage.cpp b/engines/wage/wage.cpp
index 0cac983c8f..31df42474f 100644
--- a/engines/wage/wage.cpp
+++ b/engines/wage/wage.cpp
@@ -412,7 +412,8 @@ void WageEngine::processTurnInternal(Common::String *textInput, Designed *clickI
}
bool monsterWasNull = (_monster == NULL);
- bool handled = playerScene->_script->execute(_world, _loopCount++, textInput, clickInput, this);
+ Script *script = playerScene->_script != NULL ? playerScene->_script : _world->_globalScript;
+ bool handled = script->execute(_world, _loopCount++, textInput, clickInput, this);
playerScene = _world->_player->_currentScene;