[Scummvm-cvs-logs] CVS: scummvm/scumm palette_he.cpp,1.2,1.3 wiz_he.cpp,2.42,2.43

kirben kirben at users.sourceforge.net
Thu Apr 7 08:13:34 CEST 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14193/scumm

Modified Files:
	palette_he.cpp wiz_he.cpp 
Log Message:

Ooops


Index: palette_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/palette_he.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- palette_he.cpp	7 Apr 2005 12:33:20 -0000	1.2
+++ palette_he.cpp	7 Apr 2005 15:01:30 -0000	1.3
@@ -210,7 +210,7 @@
 	dp[0] = sp[0];
 	dp[1] = sp[1];
 	dp[2] = sp[2];
-	_hePalettes[1768 + dst] = _hePalettes[1768 + src];
+	_hePalettes[1792 + dst] = dst;
 
 	setDirtyColors(dst, dst);
 }

Index: wiz_he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/wiz_he.cpp,v
retrieving revision 2.42
retrieving revision 2.43
diff -u -d -r2.42 -r2.43
--- wiz_he.cpp	7 Apr 2005 12:23:44 -0000	2.42
+++ wiz_he.cpp	7 Apr 2005 15:01:31 -0000	2.43
@@ -414,7 +414,7 @@
 					if (w < 0) {
 						code += w;
 					}
-					uint8 color = imagePal[*dataPtr++];
+					uint8 color = palPtr[*dataPtr++];
 					memset(dstPtr, color, code);
 					dstPtr += code;
 				} else {
@@ -423,7 +423,7 @@
 						code += w;
 					}
 					while (code--) {
-						*dstPtr++ = imagePal[*dataPtr++];
+						*dstPtr++ = palPtr[*dataPtr++];
 					}
 				}
 			}





More information about the Scummvm-git-logs mailing list