[Scummvm-cvs-logs] scummvm master -> d2f05efd04a57d4ce5e946e872f153eb2eaf9eb8

[dreammaster]

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:
d2f05efd04 TSAGE: R2R startup palette cleanup and fix for using sciene lab terminal


Commit: d2f05efd04a57d4ce5e946e872f153eb2eaf9eb8
    https://github.com/scummvm/scummvm/commit/d2f05efd04a57d4ce5e946e872f153eb2eaf9eb8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2013-09-30T18:56:46-07:00

Commit Message:
TSAGE: R2R startup palette cleanup and fix for using sciene lab terminal

Changed paths:
    engines/tsage/ringworld2/ringworld2_scenes0.cpp



diff --git a/engines/tsage/ringworld2/ringworld2_scenes0.cpp b/engines/tsage/ringworld2/ringworld2_scenes0.cpp
index 4ca8eee..dec2579 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();