[Scummvm-cvs-logs] CVS: scummex image.cpp,1.29,1.30 resource.cpp,1.33,1.34

Eugene Sandulenko sev at users.sourceforge.net
Sun Nov 13 18:12:10 CET 2005


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

Modified Files:
	image.cpp resource.cpp 
Log Message:
Patch from Quietust fixing MI2 datafiles parsing and fixing a warning.


Index: image.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/image.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- image.cpp	16 Dec 2004 23:44:24 -0000	1.29
+++ image.cpp	14 Nov 2005 02:10:55 -0000	1.30
@@ -951,7 +951,7 @@
 
      color = *src;
 	 src++;
-	 data = src[2] << 16 + src[1] << 8 + src[0];
+	 data = (src[2] << 16) + (src[1] << 8) + src[0];
 	 src += 3;
      shift = 24;
 

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummex/resource.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- resource.cpp	10 Apr 2005 14:55:20 -0000	1.33
+++ resource.cpp	14 Nov 2005 02:10:56 -0000	1.34
@@ -783,6 +783,13 @@
 		case IM07:
 		case IM08:
 		case IM09:
+		case IM0A:
+		case IM0B:
+		case IM0C:
+		case IM0D:
+		case IM0E:
+		case IM0F:
+		case IM10:
 		case RMIM:
 		case PALS:
 		case WRAP:





More information about the Scummvm-git-logs mailing list