diff options
author | Paul Gilbert | 2013-09-30 21:56:46 -0400 |
---|---|---|
committer | Paul Gilbert | 2013-09-30 21:56:46 -0400 |
commit | d2f05efd04a57d4ce5e946e872f153eb2eaf9eb8 (patch) | |
tree | eec139a31733f31539e64f886ecc648645fcd992 /engines/tsage | |
parent | d798a4f12a95c3911b46e3bfddb9bc84f1b6a540 (diff) | |
download | scummvm-rg350-d2f05efd04a57d4ce5e946e872f153eb2eaf9eb8.tar.gz scummvm-rg350-d2f05efd04a57d4ce5e946e872f153eb2eaf9eb8.tar.bz2 scummvm-rg350-d2f05efd04a57d4ce5e946e872f153eb2eaf9eb8.zip |
TSAGE: R2R startup palette cleanup and fix for using sciene lab terminal
Diffstat (limited to 'engines/tsage')
-rw-r--r-- | engines/tsage/ringworld2/ringworld2_scenes0.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp index 4ca8eee5de..dec257921f 100644 --- a/engines/tsage/ringworld2/ringworld2_scenes0.cpp +++ b/engines/tsage/ringworld2/ringworld2_scenes0.cpp @@ -227,8 +227,6 @@ bool Scene100::Terminal::startAction(CursorType action, Event &event) { void Scene100::postInit(SceneObjectList *OwnerList) { loadScene(100); - R2_GLOBALS._scenePalette.loadPalette(0); - R2_GLOBALS._scenePalette.setEntry(255, 255, 255, 255); SceneExt::postInit(); if (R2_GLOBALS._sceneManager._previousScene != 125) @@ -1532,6 +1530,9 @@ void Scene180::remove() { // _stripManager._field2EA = -1; SceneExt::remove(); + R2_GLOBALS._scenePalette.loadPalette(0); + R2_GLOBALS._scenePalette.setEntry(255, 255, 255, 255); + R2_GLOBALS._events.setCursor(CURSOR_WALK); // word_575F7 = 0; R2_GLOBALS._playStream.stop(); @@ -4672,8 +4673,9 @@ bool Scene400::AttractorUnit::startAction(CursorType action, Event &event) { /*--------------------------------------------------------------------------*/ void Scene400::postInit(SceneObjectList *OwnerList) { - SceneExt::postInit(); loadScene(400); + SceneExt::postInit(); + _sound1.play(20); _door.postInit(); |