thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MADS: Better initialization of animation cycling palettes

Browse source
This commit is contained in:
Paul Gilbert 2014-10-12 16:24:33 -04:00
parent f025a61558
commit d02693cb0c
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/mads/nebular/menu_nebular.cpp
View file

@ -891,7 +891,6 @@ void AnimationView::loadNextResource() {
// Signal for a screen refresh // Signal for a screen refresh
scene._spriteSlots.fullRefresh(); scene._spriteSlots.fullRefresh();
palette.setFullPalette(palette._mainPalette);
// If a sound driver has been specified, then load the correct one // If a sound driver has been specified, then load the correct one
if (!_currentAnimation->_header._soundName.empty()) { if (!_currentAnimation->_header._soundName.empty()) {
@ -918,8 +917,17 @@ void AnimationView::loadNextResource() {
// Start the new animation // Start the new animation
_currentAnimation->startAnimation(0); _currentAnimation->startAnimation(0);
// If there were any palette cycles defined, start them up // Handle the palette and cycling palette
scene.initPaletteAnimation(paletteCycles, true); 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() { void AnimationView::scriptDone() {