[Scummvm-cvs-logs] SF.net SVN: scummvm: [28704] scummvm/trunk/engines/saga/animation.cpp

[thebluegr at users.sourceforge.net]

Revision: 28704
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28704&view=rev
Author:   thebluegr
Date:     2007-08-24 04:35:59 -0700 (Fri, 24 Aug 2007)

Log Message:
-----------
Clearcutaway now sets the scene's palette. Removed two workarounds for the IHNM demo

Modified Paths:
--------------
    scummvm/trunk/engines/saga/animation.cpp

Modified: scummvm/trunk/engines/saga/animation.cpp
===================================================================
--- scummvm/trunk/engines/saga/animation.cpp	2007-08-24 11:23:57 UTC (rev 28703)
+++ scummvm/trunk/engines/saga/animation.cpp	2007-08-24 11:35:59 UTC (rev 28704)
@@ -95,10 +95,7 @@
 		startImmediately = true;
 	}
 
-	// WORKAROUND: The IHNM demo deals with chained cutaways in a different manner. Don't save
-	// the palette of cutaway 11 (the woman looking at the marble)
-	if (!(_vm->getGameId() == GID_IHNM_DEMO && cut == 11))
-		_vm->_gfx->savePalette();
+	_vm->_gfx->savePalette();
 
 	if (fade) {
 		_vm->_gfx->getCurrentPal(saved_pal);
@@ -156,12 +153,6 @@
 
 	_vm->_gfx->setPalette(palette);
 
-	// WORKAROUND for a bug found in the original IHNM demo. The palette of cutaway 12 is incorrect (the incorrect
-	// palette can be seen in the original demo too, for a split second). Therefore, use the saved palette for this
-	// cutaway
-	if (_vm->getGameId() == GID_IHNM_DEMO && cut == 12)
-		_vm->_gfx->restorePalette();
-
 	free(buf);
 	free(resourceData);
 
@@ -306,7 +297,10 @@
 }
 
 void Anim::clearCutaway(void) {
+	PalEntry *pal;
+
 	debug(1, "clearCutaway()");
+
 	if (_cutawayActive) {
 		_cutawayActive = false;
 
@@ -327,6 +321,10 @@
 			// Enable the save reminder state after each cutaway for the IHNM demo
 			_vm->_interface->setSaveReminderState(true);
 		}
+
+		// Set the scene's palette
+		_vm->_scene->getBGPal(pal);
+		_vm->_gfx->setPalette(pal);
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.