[Scummvm-cvs-logs] scummvm master -> 3d2b4cc472c613a118a23e70c3e9247154287434

dreammaster dreammaster at scummvm.org
Sat Sep 24 10:53:55 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3d2b4cc472 TSAGE: Bugfix for loading Blue Force scene 900


Commit: 3d2b4cc472c613a118a23e70c3e9247154287434
    https://github.com/scummvm/scummvm/commit/3d2b4cc472c613a118a23e70c3e9247154287434
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-09-24T01:46:18-07:00

Commit Message:
TSAGE: Bugfix for loading Blue Force scene 900

Changed paths:
    engines/tsage/blue_force/blueforce_scenes9.cpp



diff --git a/engines/tsage/blue_force/blueforce_scenes9.cpp b/engines/tsage/blue_force/blueforce_scenes9.cpp
index e39746a..a7d60f7 100644
--- a/engines/tsage/blue_force/blueforce_scenes9.cpp
+++ b/engines/tsage/blue_force/blueforce_scenes9.cpp
@@ -422,6 +422,9 @@ Scene900::Scene900(): PalettedScene() {
 }
 
 void Scene900::postInit(SceneObjectList *OwnerList) {
+	PalettedScene::postInit();
+	loadScene(900);
+
 	if (BF_GLOBALS._sceneManager._previousScene == 910)
 		BF_GLOBALS._sound1.changeSound(91);
 	_field1974 = 0;
@@ -433,7 +436,6 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 		BF_INVENTORY.setObjectScene(INV_FISHING_NET, 1);
 		BF_INVENTORY.setObjectScene(INV_HOOK, 1);
 	}
-	PalettedScene::postInit();
 	_object3._flag = 0;
 	if (BF_GLOBALS._bookmark >= bFinishedWGreen) {
 		_object7.postInit();
@@ -450,7 +452,7 @@ void Scene900::postInit(SceneObjectList *OwnerList) {
 	}
 	if (BF_INVENTORY.getObjectScene(INV_FISHING_NET) == 900)
 		_object3._flag = 1;
-	loadScene(900);
+
 	_stripManager.addSpeaker(&_gameTextSpeaker);
 	_stripManager.addSpeaker(&_jakeJacketSpeaker);
 	_stripManager.addSpeaker(&_lyleHatSpeaker);






More information about the Scummvm-git-logs mailing list