[Scummvm-cvs-logs] SF.net SVN: scummvm:[50074] scummvm/trunk/engines/sci/graphics

[m_kiewitz at users.sourceforge.net]

Revision: 50074
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50074&view=rev
Author:   m_kiewitz
Date:     2010-06-20 12:21:57 +0000 (Sun, 20 Jun 2010)

Log Message:
-----------
SCI: some cleanup for kPalVary

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/palette.cpp
    scummvm/trunk/engines/sci/graphics/palette.h

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-20 10:25:46 UTC (rev 50073)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-06-20 12:21:57 UTC (rev 50074)
@@ -464,14 +464,14 @@
 // Saving/restoring
 //         need to save start and target-palette, when palVaryOn = true
 
-void GfxPalette::startPalVary(uint16 paletteId, uint16 ticks) {
-	kernelSetFromResource(paletteId, true);
+void GfxPalette::startPalVary(GuiResourceId resourceId, uint16 ticks) {
+	kernelSetFromResource(resourceId, true);
 	return;
 
-	if (_palVaryId >= 0)	// another palvary is taking place, return
+	if (_palVaryResourceId >= 0)	// another palvary is taking place, return
 		return;
 
-	_palVaryId = paletteId;
+	_palVaryResourceId = resourceId;
 	_palVaryStart = g_system->getMillis();
 	_palVaryEnd = _palVaryStart + ticks * 1000 / 60;
 	g_sci->getTimerManager()->installTimerProc(&palVaryCallback, 1000000 / 60, this);
@@ -486,10 +486,11 @@
 
 void GfxPalette::stopPalVary() {
 	g_sci->getTimerManager()->removeTimerProc(&palVaryCallback);
-	_palVaryId = -1;	// invalidate the target palette
 
 	// HACK: just set the target palette
-	kernelSetFromResource(_palVaryId, true);
+	kernelSetFromResource(_palVaryResourceId, true);
+
+	_palVaryResourceId = -1;	// invalidate the target palette
 }
 
 void GfxPalette::palVaryCallback(void *refCon) {

Modified: scummvm/trunk/engines/sci/graphics/palette.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.h	2010-06-20 10:25:46 UTC (rev 50073)
+++ scummvm/trunk/engines/sci/graphics/palette.h	2010-06-20 12:21:57 UTC (rev 50074)
@@ -60,7 +60,7 @@
 	void kernelAnimateSet();
 	void kernelAssertPalette(GuiResourceId resourceId);
 
-	void startPalVary(uint16 paletteId, uint16 ticks);
+	void startPalVary(GuiResourceId resourceId, uint16 ticks);
 	void togglePalVary(bool pause);
 	void stopPalVary();
 
@@ -72,7 +72,7 @@
 
 	GfxScreen *_screen;
 	ResourceManager *_resMan;
-	int16 _palVaryId;
+	GuiResourceId _palVaryResourceId;
 	uint32 _palVaryStart;
 	uint32 _palVaryEnd;
 


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