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

[m_kiewitz at users.sourceforge.net]

Revision: 47953
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47953&view=rev
Author:   m_kiewitz
Date:     2010-02-07 12:00:06 +0000 (Sun, 07 Feb 2010)

Log Message:
-----------
SCI: added dummy assertpalette to GfxPalette, setting destination palette immediately on kPalVary(start) call

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

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-02-07 11:50:18 UTC (rev 47952)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-02-07 12:00:06 UTC (rev 47953)
@@ -688,10 +688,9 @@
 }
 
 reg_t kAssertPalette(EngineState *s, int argc, reg_t *argv) {
-	GuiResourceId viewId = argv[1].toUint16();
-	// TODO: implement this
+	GuiResourceId paletteId = argv[1].toUint16();
 
-	warning("kAssertPalette() called with viewId = %d", viewId);
+	s->_gfxPalette->kernelAssertPalette(paletteId);
 	return s->r_acc;
 }
 

Modified: scummvm/trunk/engines/sci/graphics/palette.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.cpp	2010-02-07 11:50:18 UTC (rev 47952)
+++ scummvm/trunk/engines/sci/graphics/palette.cpp	2010-02-07 12:00:06 UTC (rev 47953)
@@ -391,6 +391,10 @@
 	setOnScreen();
 }
 
+void GfxPalette::kernelAssertPalette(GuiResourceId resourceId) {
+	warning("kAssertPalette %d", resourceId);
+}
+
 // palVary
 //  init - only does, if palVaryOn == false
 //         target, start, new palette allocation
@@ -418,6 +422,9 @@
 //         need to save start and target-palette, when palVaryOn = true
 
 void GfxPalette::startPalVary(uint16 paletteId, uint16 ticks) {
+	kernelSetFromResource(paletteId, true);
+	return;
+
 	if (_palVaryId >= 0)	// another palvary is taking place, return
 		return;
 

Modified: scummvm/trunk/engines/sci/graphics/palette.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/palette.h	2010-02-07 11:50:18 UTC (rev 47952)
+++ scummvm/trunk/engines/sci/graphics/palette.h	2010-02-07 12:00:06 UTC (rev 47953)
@@ -57,6 +57,7 @@
 	int16 kernelFindColor(uint16 r, uint16 g, uint16 b);
 	bool kernelAnimate(byte fromColor, byte toColor, int speed);
 	void kernelAnimateSet();
+	void kernelAssertPalette(GuiResourceId resourceId);
 
 	void startPalVary(uint16 paletteId, uint16 ticks);
 	void togglePalVary(bool pause);


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