[Scummvm-cvs-logs] CVS: scummvm/gob map.cpp,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Mon Apr 11 13:03:47 CEST 2005


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

Modified Files:
	map.cpp 
Log Message:
Endian fixes

Index: map.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/map.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- map.cpp	9 Apr 2005 19:32:28 -0000	1.4
+++ map.cpp	11 Apr 2005 20:03:12 -0000	1.5
@@ -601,6 +601,7 @@
 	}
 
 	map_loadDataFromAvo((char *)&gob_objCount, 2);
+	gob_objCount = FROM_LE_16(gob_objCount);
 	for (i = 0; i < gob_objCount; i++) {
 		gob_objects[i] =
 		    (Gob_Object *) malloc(sizeof(Gob_Object));
@@ -674,10 +675,11 @@
 	gob_objects[10]->unk14 = 1;
 
 	map_loadDataFromAvo((char *)&state, 2);
+	state = FROM_LE_16(state);
 	for (i = 0; i < state; i++) {
 		map_avoDataPtr += 30;
 
-		map_loadDataFromAvo((char *)&flag, 4);
+		map_loadDataFromAvo((char *)&flag, 4);	// FIXME: Endian conversion needed?
 		map_avoDataPtr += 56;
 
 		if (flag != 0)





More information about the Scummvm-git-logs mailing list