[Scummvm-cvs-logs] CVS: scummvm/sword1 router.cpp,1.4,1.5

Robert G?ffringmann lavosspawn at users.sourceforge.net
Thu Dec 18 04:17:00 CET 2003


Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1:/tmp/cvs-serv27842/sword1

Modified Files:
	router.cpp 
Log Message:
endian fix for router.

Index: router.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/router.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- router.cpp	17 Dec 2003 01:18:03 -0000	1.4
+++ router.cpp	18 Dec 2003 12:15:59 -0000	1.5
@@ -2435,15 +2435,31 @@
 	nTurnFrames = fMegaWalkData[1];
  	fMegaWalkData += 2;
 
- 	memmove(&_dx[0],fMegaWalkData,NO_DIRECTIONS*(nWalkFrames+1+nTurnFrames)*sizeof(int32));
+	for (int32 cnt = 0; cnt < NO_DIRECTIONS * (nWalkFrames + 1 + nTurnFrames); cnt++) {
+		_dx[cnt] = (int32)READ_LE_UINT32(fMegaWalkData);
+		fMegaWalkData += 4;
+	}
+	for (int32 cnt = 0; cnt < NO_DIRECTIONS * (nWalkFrames + 1 + nTurnFrames); cnt++) {
+		_dy[cnt] = (int32)READ_LE_UINT32(fMegaWalkData);
+		fMegaWalkData += 4;
+	}
+ 	/*memmove(&_dx[0],fMegaWalkData,NO_DIRECTIONS*(nWalkFrames+1+nTurnFrames)*sizeof(int32));
  	fMegaWalkData += NO_DIRECTIONS*(nWalkFrames+1+nTurnFrames)*sizeof(int32);
  	memmove(&_dy[0],fMegaWalkData,NO_DIRECTIONS*(nWalkFrames+1+nTurnFrames)*sizeof(int32));
- 	fMegaWalkData += NO_DIRECTIONS*(nWalkFrames+1+nTurnFrames)*sizeof(int32);
+ 	fMegaWalkData += NO_DIRECTIONS*(nWalkFrames+1+nTurnFrames)*sizeof(int32);*/
 
- 	memmove(&modX[0],fMegaWalkData,NO_DIRECTIONS*sizeof(int32));
+	for (uint32 cnt = 0; cnt < NO_DIRECTIONS; cnt++) {
+		modX[cnt] = (int32)READ_LE_UINT32(fMegaWalkData);
+		fMegaWalkData += 4;
+	}
+	for (uint32 cnt = 0; cnt < NO_DIRECTIONS; cnt++) {
+		modY[cnt] = (int32)READ_LE_UINT32(fMegaWalkData);
+		fMegaWalkData += 4;
+	}
+ 	/*memmove(&modX[0],fMegaWalkData,NO_DIRECTIONS*sizeof(int32));
  	fMegaWalkData += NO_DIRECTIONS*sizeof(int32);
  	memmove(&modY[0],fMegaWalkData,NO_DIRECTIONS*sizeof(int32));
- 	fMegaWalkData += NO_DIRECTIONS*sizeof(int32);
+ 	fMegaWalkData += NO_DIRECTIONS*sizeof(int32);*/
 
 	//ResUnlock(megaObject->o_mega_resource);			// mouse wiggle
 	//ResClose(megaObject->o_mega_resource);			// mouse wiggle





More information about the Scummvm-git-logs mailing list