diff options
| author | Max Horn | 2003-04-30 12:57:46 +0000 |
|---|---|---|
| committer | Max Horn | 2003-04-30 12:57:46 +0000 |
| commit | 30e3a8161857260e75c84e4a54cf0849afa10dfd (patch) | |
| tree | e804edaef54de9376e87d140a3b93ad1e33033fc | |
| parent | 01d3067b7dd5697d7a0cead1516e23657df5d3b7 (diff) | |
| download | scummvm-rg350-30e3a8161857260e75c84e4a54cf0849afa10dfd.tar.gz scummvm-rg350-30e3a8161857260e75c84e4a54cf0849afa10dfd.tar.bz2 scummvm-rg350-30e3a8161857260e75c84e4a54cf0849afa10dfd.zip | |
use READ_LE_UINT16 instead of FROM_LE_16 to avoid unaligned memory access problems on PalmOS
svn-id: r7223
| -rw-r--r-- | scumm/boxes.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp index c414816b91..d5b93967cb 100644 --- a/scumm/boxes.cpp +++ b/scumm/boxes.cpp @@ -163,7 +163,7 @@ int Scumm::getScale(int box, int x, int y) { } 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 @@ int Scumm::getBoxScale(int box) { 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 @@ void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) { 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); } } |