[Scummvm-cvs-logs] CVS: scummvm/gob draw.cpp,1.3,1.4 game.cpp,1.9,1.10 inter.cpp,1.6,1.7

Joost Peters joostp at users.sourceforge.net
Sat Apr 9 11:14:19 CEST 2005


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

Modified Files:
	draw.cpp game.cpp inter.cpp 
Log Message:
read index as LE value


Index: draw.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/draw.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- draw.cpp	5 Apr 2005 17:41:37 -0000	1.3
+++ draw.cpp	9 Apr 2005 18:14:01 -0000	1.4
@@ -404,9 +404,9 @@
 			    szGame_TotResTable + szGame_TotResItem *
 			    game_totResourceTable->itemsCount + offset;
 		} else {
-			dataBuf =
+			dataBuf = 
 			    game_imFileData +
-			    ((int32 *)game_imFileData)[-offset - 1];
+			    (int32)READ_LE_UINT32(&((int32 *)game_imFileData)[-offset - 1]);
 		}
 
 		draw_spriteRight = itemPtr->width;

Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- game.cpp	9 Apr 2005 17:58:07 -0000	1.9
+++ game.cpp	9 Apr 2005 18:14:01 -0000	1.10
@@ -377,7 +377,7 @@
 		return ((char *)game_totResourceTable) + szGame_TotResTable +
 		    szGame_TotResItem * game_totResourceTable->itemsCount + offset;
 	} else {
-		return (char *)(game_imFileData + ((int32 *)game_imFileData)[-offset - 1]);
+		return (char *)(game_imFileData + (int32)READ_LE_UINT32(&((int32 *)game_imFileData)[-offset - 1]));
 	}
 }
 

Index: inter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- inter.cpp	9 Apr 2005 01:28:16 -0000	1.6
+++ inter.cpp	9 Apr 2005 18:14:01 -0000	1.7
@@ -818,7 +818,7 @@
 		    ((char *)game_totResourceTable) + szGame_TotResTable +
 		    szGame_TotResItem * game_totResourceTable->itemsCount + offset;
 	} else {
-		dataBuf = game_imFileData + ((int32 *)game_imFileData)[-offset - 1];
+		dataBuf = game_imFileData + (int32)READ_LE_UINT32(&((int32 *)game_imFileData)[-offset - 1]);
 	}
 
 	width = itemPtr->width;





More information about the Scummvm-git-logs mailing list