[Scummvm-cvs-logs] CVS: scummvm/bs2/driver _mouse.cpp,1.13,1.14 d_sound.cpp,1.46,1.47 render.cpp,1.19,1.20

Oliver Kiehl olki at users.sourceforge.net
Fri Sep 12 11:53:27 CEST 2003


Update of /cvsroot/scummvm/scummvm/bs2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv22832/driver

Modified Files:
	_mouse.cpp d_sound.cpp render.cpp 
Log Message:
endian fixes


Index: _mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/_mouse.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- _mouse.cpp	28 Aug 2003 06:14:46 -0000	1.13
+++ _mouse.cpp	12 Sep 2003 18:52:53 -0000	1.14
@@ -349,7 +349,7 @@
 
 	if (++mouseFrame == mouseAnim->noAnimFrames)
 		mouseFrame = MOUSEFLASHFRAME;
-	mouseSprite = (uint8 *) mouseAnim + *(mouseOffsets + mouseFrame);
+	mouseSprite = (uint8 *) mouseAnim + (int32)READ_LE_UINT32(mouseOffsets + mouseFrame);
 
 	if (mouseFrame != prevMouseFrame)
 		DrawMouse();

Index: d_sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/d_sound.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- d_sound.cpp	10 Sep 2003 12:43:53 -0000	1.46
+++ d_sound.cpp	12 Sep 2003 18:52:53 -0000	1.47
@@ -698,7 +698,7 @@
 		while (i < 100) {
 			if (*data == 'd') {
 				data32 = (uint32*)data;
-				if (*data32 == 'atad')
+				if (READ_LE_UINT32(data32) == 'atad')
 					break;
 			}
 			i += 1;

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/driver/render.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- render.cpp	9 Sep 2003 12:45:33 -0000	1.19
+++ render.cpp	12 Sep 2003 18:52:53 -0000	1.20
@@ -1139,7 +1139,7 @@
 	memset(memchunk, 0, p->w * p->h);
 
 	for (i = 0; i < p->h; i++) {
-		if (p->offset[i] == 0)
+		if (FROM_LE_32(p->offset[i]) == 0)
 			continue;
 
 		line = (_parallaxLine *) ((uint8 *) p + FROM_LE_32(p->offset[i]));





More information about the Scummvm-git-logs mailing list