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

[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:
d02693cb0c MADS: Better initialization of animation cycling palettes


Commit: d02693cb0c65b48934aed8c61c9926e9d06ac11c
    https://github.com/scummvm/scummvm/commit/d02693cb0c65b48934aed8c61c9926e9d06ac11c
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2014-10-12T16:24:33-04:00

Commit Message:
MADS: Better initialization of animation cycling palettes

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 84db5a4..069557d 100644
--- a/engines/mads/nebular/menu_nebular.cpp
+++ b/engines/mads/nebular/menu_nebular.cpp
@@ -891,7 +891,6 @@ 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()) {
@@ -918,8 +917,17 @@ void AnimationView::loadNextResource() {
 	// Start the new animation
 	_currentAnimation->startAnimation(0);
 
-	// If there were any palette cycles defined, start them up
-	scene.initPaletteAnimation(paletteCycles, true);
+	// Handle the palette and cycling palette
+	scene._cyclingActive = false;
+	Common::copy(&palette._mainPalette[0], &palette._mainPalette[PALETTE_SIZE],
+		&palette._cyclingPalette[0]);
+
+	_vm->_game->_fx = (ScreenTransition)resEntry._fx;
+	if (!_vm->_game->_fx) {
+		palette.setFullPalette(palette._mainPalette);
+	}
+
+	scene.initPaletteAnimation(paletteCycles, (paletteCycles.size() > 0) && !_vm->_game->_fx);
 }
 
 void AnimationView::scriptDone() {