[Scummvm-cvs-logs] CVS: scummvm/scumm boxes.cpp,1.17,1.18

[Max Horn]

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);
 	}
 }