aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe/stateloader.cpp
diff options
context:
space:
mode:
authorKamil Zbróg2014-01-07 00:13:05 +0000
committerKamil Zbróg2014-01-07 00:13:05 +0000
commite94fabc37407a7d300af04493b0f5cbced42a092 (patch)
tree998bfaa03109a49d2bb9ec5b17e817ef7cc32a4c /engines/fullpipe/stateloader.cpp
parent165b8be77f4621ff5de8a483c6cd9ac497492a0a (diff)
parent4f6c3efa15c68dfa49bf5e6fe75dec034abe903b (diff)
downloadscummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.gz
scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.bz2
scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.zip
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/fullpipe/stateloader.cpp')
-rw-r--r--engines/fullpipe/stateloader.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp
index 6a56ffd662..9c54947b35 100644
--- a/engines/fullpipe/stateloader.cpp
+++ b/engines/fullpipe/stateloader.cpp
@@ -82,8 +82,11 @@ bool FullpipeEngine::loadGam(const char *fname, int scene) {
setMusicAllowed(_gameLoader->_gameVar->getSubVarAsInt("MUSIC_ALLOWED"));
if (scene) {
- _gameLoader->loadScene(scene);
- _gameLoader->gotoScene(scene, TrubaLeft);
+ _gameLoader->loadScene(726);
+ _gameLoader->gotoScene(726, TrubaLeft);
+
+ if (scene != 726)
+ _gameLoader->preloadScene(726, getSceneEntrance(scene));
} else {
if (_flgPlayIntro) {
_gameLoader->loadScene(SC_INTRO1);