[Scummvm-cvs-logs] SF.net SVN: scummvm:[49908] scummvm/trunk/engines/sci/engine/kgraphics.cpp

[thebluegr at users.sourceforge.net]

Revision: 49908
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49908&view=rev
Author:   thebluegr
Date:     2010-06-16 21:44:33 +0000 (Wed, 16 Jun 2010)

Log Message:
-----------
Added handling for the SCI2.1 kPalette(1) call. The graphics in Torin's Passage are shown with the correct colors now

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

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-06-16 21:23:47 UTC (rev 49907)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-06-16 21:44:33 UTC (rev 49908)
@@ -553,9 +553,11 @@
 
 	switch (argv[0].toUint16()) {
 	case 1: // Set resource palette
-		if (argc==3) {
+		if (argc == 2 || argc == 3) {
 			GuiResourceId resourceId = argv[1].toUint16();
-			bool force = argv[2].toUint16() == 2 ? true : false;
+			bool force = false;
+			if (argc == 3)
+				force = argv[2].toUint16() == 2 ? true : false;
 			g_sci->_gfxPalette->kernelSetFromResource(resourceId, force);
 		} else {
 			warning("kPalette(1) called with %d parameters", argc);


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