[Scummvm-cvs-logs] SF.net SVN: scummvm:[50176] scummvm/trunk/engines/m4/graphics.cpp

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Wed Jun 23 13:28:54 CEST 2010


Revision: 50176
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50176&view=rev
Author:   dreammaster
Date:     2010-06-23 11:28:53 +0000 (Wed, 23 Jun 2010)

Log Message:
-----------
Corrected newly added palette conversion warning

Modified Paths:
--------------
    scummvm/trunk/engines/m4/graphics.cpp

Modified: scummvm/trunk/engines/m4/graphics.cpp
===================================================================
--- scummvm/trunk/engines/m4/graphics.cpp	2010-06-23 11:22:44 UTC (rev 50175)
+++ scummvm/trunk/engines/m4/graphics.cpp	2010-06-23 11:28:53 UTC (rev 50176)
@@ -920,10 +920,10 @@
 
 	for (int i = 0; i < width() * height(); ++i, ++p) {
 		if (!isTransparent || (*p != TRANSPARENT_COLOUR_INDEX)) {
-			if (*p < list->size()) {
+			if (*p < list->size())
+				*p = palIndexes[*p];
+			else
 				warning("Pal pointer exceeds list size");
-				*p = palIndexes[*p];
-			}
 		}
 	}
 


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




More information about the Scummvm-git-logs mailing list