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

[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:
c584515b24 MADS: Fix palette for display of intro animation


Commit: c584515b2439a53cd17ef03597132b94bd342aa5
    https://github.com/scummvm/scummvm/commit/c584515b2439a53cd17ef03597132b94bd342aa5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-10-08T22:21:26-04:00

Commit Message:
MADS: Fix palette for display of intro animation

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



diff --git a/engines/mads/nebular/menu_nebular.cpp b/engines/mads/nebular/menu_nebular.cpp
index 52f6988..6db9179 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -877,10 +877,11 @@ void AnimationView::doFrame() {
 
 void AnimationView::loadNextResource() {
 	Scene &scene = _vm->_game->_scene;
+	Palette &palette = *_vm->_palette;
 	ResourceEntry &resEntry = _resources[_resourceIndex];
 
 	if (resEntry._bgFlag)
-		_vm->_palette->resetGamePalette(1, 8);
+		palette.resetGamePalette(1, 8);
 
 	// Load the new animation
 	delete _currentAnimation;
@@ -891,6 +892,7 @@ void AnimationView::loadNextResource() {
 
 	// Signal for a screen refresh
 	scene._spriteSlots.fullRefresh();
+	palette.setFullPalette(palette._mainPalette);
 
 	// If a sound driver has been specified, then load the correct one
 	if (!_currentAnimation->_header._soundName.empty()) {