diff options
| author | Strangerke | 2011-09-27 22:45:37 +0200 |
|---|---|---|
| committer | Strangerke | 2011-09-27 22:45:37 +0200 |
| commit | 2e40e474372ae2021d766e58751bd8b9dd81bd11 (patch) | |
| tree | a845e4d13cc6ae219f88f3edc7e4add1a2d13c52 | |
| parent | dfadac1558a247dc0af7d8368eb50c20316161c4 (diff) | |
| download | scummvm-rg350-2e40e474372ae2021d766e58751bd8b9dd81bd11.tar.gz scummvm-rg350-2e40e474372ae2021d766e58751bd8b9dd81bd11.tar.bz2 scummvm-rg350-2e40e474372ae2021d766e58751bd8b9dd81bd11.zip | |
TsAGE: Fix an instant crash in scene 100.
This isn't really a hack: the engine expects things to be done in a particular
order, which wasn't so strict in the original BF. The code is adapted accordingly.
| -rw-r--r-- | engines/tsage/blue_force/blueforce_scenes1.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/engines/tsage/blue_force/blueforce_scenes1.cpp b/engines/tsage/blue_force/blueforce_scenes1.cpp index 2e3a504e0c..0d47cb1c5d 100644 --- a/engines/tsage/blue_force/blueforce_scenes1.cpp +++ b/engines/tsage/blue_force/blueforce_scenes1.cpp @@ -166,24 +166,29 @@ Scene100::Scene100(): SceneExt() { } void Scene100::postInit(SceneObjectList *OwnerList) { + SceneExt::postInit(); + if (BF_GLOBALS._dayNumber < 6) { + // Title + loadScene(100); + } else { + // Credits + loadScene(101); + } BF_GLOBALS._scenePalette.loadPalette(2); BF_GLOBALS._v51C44 = 1; - Scene::postInit(); BF_GLOBALS._interfaceY = SCREEN_HEIGHT; - _globals->_player.enableControl(); + _globals->_player.postInit(); _globals->_player.hide(); _globals->_player.disableControl(); _index = 109; if (BF_GLOBALS._dayNumber < 6) { // Title - loadScene(100); BF_GLOBALS._sound1.play(2); setAction(&_action2, this); } else { // Credits - loadScene(101); BF_GLOBALS._sound1.play(118); setAction(&_action1, this); } |