[Scummvm-cvs-logs] scummvm master -> 6c25604b9ac38024dccaa89de2295170deb413f6

[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:
6c25604b9a MADS: Fix palette setup for credits view


Commit: 6c25604b9ac38024dccaa89de2295170deb413f6
    https://github.com/scummvm/scummvm/commit/6c25604b9ac38024dccaa89de2295170deb413f6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-09-04T21:53:47-04:00

Commit Message:
MADS: Fix palette setup for credits view

Changed paths:
    engines/mads/nebular/dialogs_nebular.cpp
    engines/mads/nebular/menu_nebular.cpp
    engines/mads/nebular/menu_nebular.h



diff --git a/engines/mads/nebular/dialogs_nebular.cpp b/engines/mads/nebular/dialogs_nebular.cpp
index ff11953..57edbf9 100644
--- a/engines/mads/nebular/dialogs_nebular.cpp
+++ b/engines/mads/nebular/dialogs_nebular.cpp
@@ -571,7 +571,8 @@ void FullScreenDialog::display() {
 	int currentSceneId = scene._currentSceneId;
 	int priorSceneId = scene._priorSceneId;
 
-	scene.loadScene(_screenId, game._aaName, _palFlag);
+	SceneInfo *sceneInfo = SceneInfo::init(_vm);
+	sceneInfo->load(_screenId, 0, "", 0, scene._depthSurface, scene._backgroundSurface);
 
 	scene._priorSceneId = priorSceneId;
 	scene._currentSceneId = currentSceneId;
@@ -593,16 +594,9 @@ void FullScreenDialog::display() {
 	game._fx = _vm->_screenFade == SCREEN_FADE_SMOOTH ? kTransitionFadeIn : kCenterVertTransition;
 	game._trigger = 0;
 
-	_vm->_palette->setEntry(10, 0, 63, 0);
-	_vm->_palette->setEntry(11, 0, 45, 0);
-	_vm->_palette->setEntry(12, 63, 63, 0);
-	_vm->_palette->setEntry(13, 45, 45, 0);
-	_vm->_palette->setEntry(14, 63, 63, 63);
-	_vm->_palette->setEntry(15, 45, 45, 45);
-
-
 	// Clear the screen and draw the upper and lower horizontal lines
 	_vm->_screen.empty();
+	_vm->_palette->setLowRange();
 	_vm->_screen.hLine(0, 20, MADS_SCREEN_WIDTH, 2);
 	_vm->_screen.hLine(0, 179, MADS_SCREEN_WIDTH, 2);
 	_vm->_screen.copyRectToScreen(Common::Rect(0, 0, MADS_SCREEN_WIDTH, MADS_SCREEN_HEIGHT));
diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index d5a1d85..d34f62a 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -625,10 +625,18 @@ void TextView::processText() {
 }
 
 void TextView::display() {
-	MenuView::display();
+	resetPalette();
+
+	FullScreenDialog::display();
 	_sceneChanged = true;
 }
 
+void TextView::resetPalette() {
+	_vm->_palette->resetGamePalette(8, 8);
+	_vm->_palette->setEntry(5, 0, 63, 63);
+	_vm->_palette->setEntry(6, 0, 45, 45);
+}
+
 void TextView::doFrame() {
 	Scene &scene = _vm->_game->_scene;
 	if (!_animating)
diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h
index 8255c5b..767183c 100644
--- a/engines/mads/nebular/menu_nebular.h
+++ b/engines/mads/nebular/menu_nebular.h
@@ -200,6 +200,11 @@ private:
 	 * Called when the script is finished
 	 */
 	void scriptDone();
+
+	/**
+	 * Reset the game palette
+	 */
+	void resetPalette();
 protected:
 	virtual void display();