[Scummvm-cvs-logs] SF.net SVN: scummvm: [26119] scummvm/trunk/engines/scumm/he/wiz_he.cpp

kirben at users.sourceforge.net kirben at users.sourceforge.net
Tue Mar 13 00:03:31 CET 2007


Revision: 26119
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26119&view=rev
Author:   kirben
Date:     2007-03-12 16:03:30 -0700 (Mon, 12 Mar 2007)

Log Message:
-----------
Fix xmap regression, when drawing wiz images.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/he/wiz_he.cpp

Modified: scummvm/trunk/engines/scumm/he/wiz_he.cpp
===================================================================
--- scummvm/trunk/engines/scumm/he/wiz_he.cpp	2007-03-12 22:54:04 UTC (rev 26118)
+++ scummvm/trunk/engines/scumm/he/wiz_he.cpp	2007-03-12 23:03:30 UTC (rev 26119)
@@ -553,7 +553,7 @@
 	int h, w, xoff, dstInc;
 
 	if (type == kWizXMap) {
-		assert(palPtr != 0 && xmapPtr != 0);
+		assert(xmapPtr != 0);
 	}
 	if (type == kWizRMap) {
 		assert(palPtr != 0);
@@ -619,7 +619,7 @@
 					}
 					while (code--) {
 						if (type == kWizXMap) {
-							*dstPtr = xmapPtr[palPtr[*dataPtr] * 256 + *dstPtr];
+							*dstPtr = xmapPtr[*dataPtr * 256 + *dstPtr];
 						}
 						if (type == kWizRMap) {
 							*dstPtr = palPtr[*dataPtr];
@@ -647,7 +647,7 @@
 					}
 					while (code--) {
 						if (type == kWizXMap) {
-							*dstPtr = xmapPtr[palPtr[*dataPtr++] * 256 + *dstPtr];
+							*dstPtr = xmapPtr[*dataPtr++ * 256 + *dstPtr];
 						}
 						if (type == kWizRMap) {
 							*dstPtr = palPtr[*dataPtr++];


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