aboutsummaryrefslogtreecommitdiff
path: root/scumm/boxes.cpp
diff options
context:
space:
mode:
authorJamieson Christian2003-05-16 00:07:47 +0000
committerJamieson Christian2003-05-16 00:07:47 +0000
commit9d7cd48dcc7b51bcb405c7e7574d5a94236a7af5 (patch)
tree5fa325a6a36681d3977b79bc83a886e304d7bd63 /scumm/boxes.cpp
parent9018be6cb327dcb2508855cc46765cd829192af0 (diff)
downloadscummvm-rg350-9d7cd48dcc7b51bcb405c7e7574d5a94236a7af5.tar.gz
scummvm-rg350-9d7cd48dcc7b51bcb405c7e7574d5a94236a7af5.tar.bz2
scummvm-rg350-9d7cd48dcc7b51bcb405c7e7574d5a94236a7af5.zip
Fixed VC++ warnings
svn-id: r7555
Diffstat (limited to 'scumm/boxes.cpp')
-rw-r--r--scumm/boxes.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/scumm/boxes.cpp b/scumm/boxes.cpp
index 67ec2e32ec..d56118a5d8 100644
--- a/scumm/boxes.cpp
+++ b/scumm/boxes.cpp
@@ -318,15 +318,15 @@ void Scumm::getBoxCoordinates(int boxnum, BoxCoords *box) {
Box *bp = getBoxBaseAddr(boxnum);
if (_features & GF_AFTER_V8) {
- box->ul.x = (int32)FROM_LE_32(bp->v8.ulx);
- box->ul.y = (int32)FROM_LE_32(bp->v8.uly);
- box->ur.x = (int32)FROM_LE_32(bp->v8.urx);
- box->ur.y = (int32)FROM_LE_32(bp->v8.ury);
+ box->ul.x = (short)FROM_LE_32(bp->v8.ulx);
+ box->ul.y = (short)FROM_LE_32(bp->v8.uly);
+ box->ur.x = (short)FROM_LE_32(bp->v8.urx);
+ box->ur.y = (short)FROM_LE_32(bp->v8.ury);
- box->ll.x = (int32)FROM_LE_32(bp->v8.llx);
- box->ll.y = (int32)FROM_LE_32(bp->v8.lly);
- box->lr.x = (int32)FROM_LE_32(bp->v8.lrx);
- box->lr.y = (int32)FROM_LE_32(bp->v8.lry);
+ box->ll.x = (short)FROM_LE_32(bp->v8.llx);
+ box->ll.y = (short)FROM_LE_32(bp->v8.lly);
+ box->lr.x = (short)FROM_LE_32(bp->v8.lrx);
+ box->lr.y = (short)FROM_LE_32(bp->v8.lry);
// FIXME: Some walkboxes in CMI appear to have been flipped,
// in the sense that for instance the lower boundary is above