[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.17,1.18
Max Horn
fingolfin at users.sourceforge.net
Wed Apr 30 05:58:11 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound mididrv.h,1.17,1.18 mixer.cpp,1.34,1.35 mpu401.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.42,1.43 gfx.cpp,2.63,2.64 imuse.cpp,2.19,2.20 imuse_digi.cpp,1.11,1.12 resource.cpp,1.64,1.65 saveload.cpp,1.59,1.60 script.cpp,1.68,1.69 script_v6.cpp,1.100,1.101 scumm.h,1.173,1.174 scummvm.cpp,2.115,2.116 sound.cpp,1.105,1.106
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv2971
Modified Files:
boxes.cpp
Log Message:
use READ_LE_UINT16 instead of FROM_LE_16 to avoid unaligned memory access problems on PalmOS
Index: boxes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/boxes.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- boxes.cpp 27 Apr 2003 22:21:22 -0000 1.17
+++ boxes.cpp 30 Apr 2003 12:57:46 -0000 1.18
@@ -163,7 +163,7 @@
} else
return FROM_LE_32(ptr->v8.scale);
} else {
- uint16 scale = FROM_LE_16(ptr->old.scale);
+ uint16 scale = READ_LE_UINT16(&ptr->old.scale);
if (scale & 0x8000) {
scale = (scale & 0x7FFF) + 1;
@@ -190,7 +190,7 @@
if (_features & GF_AFTER_V8)
return FROM_LE_32(ptr->v8.scale);
else
- return FROM_LE_16(ptr->old.scale);
+ return READ_LE_UINT16(&ptr->old.scale);
}
byte Scumm::getNumBoxes() {
@@ -325,15 +325,15 @@
SWAP(box->ll.y, box->lr.y);
}
} else {
- box->ul.x = (int16)FROM_LE_16(bp->old.ulx);
- box->ul.y = (int16)FROM_LE_16(bp->old.uly);
- box->ur.x = (int16)FROM_LE_16(bp->old.urx);
- box->ur.y = (int16)FROM_LE_16(bp->old.ury);
+ box->ul.x = (int16)READ_LE_UINT16(&bp->old.ulx);
+ box->ul.y = (int16)READ_LE_UINT16(&bp->old.uly);
+ box->ur.x = (int16)READ_LE_UINT16(&bp->old.urx);
+ box->ur.y = (int16)READ_LE_UINT16(&bp->old.ury);
- box->ll.x = (int16)FROM_LE_16(bp->old.llx);
- box->ll.y = (int16)FROM_LE_16(bp->old.lly);
- box->lr.x = (int16)FROM_LE_16(bp->old.lrx);
- box->lr.y = (int16)FROM_LE_16(bp->old.lry);
+ box->ll.x = (int16)READ_LE_UINT16(&bp->old.llx);
+ box->ll.y = (int16)READ_LE_UINT16(&bp->old.lly);
+ box->lr.x = (int16)READ_LE_UINT16(&bp->old.lrx);
+ box->lr.y = (int16)READ_LE_UINT16(&bp->old.lry);
}
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound mididrv.h,1.17,1.18 mixer.cpp,1.34,1.35 mpu401.cpp,1.5,1.6
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.42,1.43 gfx.cpp,2.63,2.64 imuse.cpp,2.19,2.20 imuse_digi.cpp,1.11,1.12 resource.cpp,1.64,1.65 saveload.cpp,1.59,1.60 script.cpp,1.68,1.69 script_v6.cpp,1.100,1.101 scumm.h,1.173,1.174 scummvm.cpp,2.115,2.116 sound.cpp,1.105,1.106
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list