diff options
| author | Jamieson Christian | 2003-06-18 22:35:03 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2003-06-18 22:35:03 +0000 |
| commit | 9e519241666d1c2a433f79026e49e6c6778496cf (patch) | |
| tree | c01cbd45162d488a2bf7ef5468d39a62e9679280 /scumm/object.cpp | |
| parent | e985c33dab328e2a31f5cf9f5d0d378d40b76740 (diff) | |
| download | scummvm-rg350-9e519241666d1c2a433f79026e49e6c6778496cf.tar.gz scummvm-rg350-9e519241666d1c2a433f79026e49e6c6778496cf.tar.bz2 scummvm-rg350-9e519241666d1c2a433f79026e49e6c6778496cf.zip | |
Fixed MSVC warnings
svn-id: r8544
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index c388734e0a..ae0317ca94 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -518,9 +518,9 @@ void Scumm::loadRoomObjects() { if (_version == 8) _numObjectsInRoom = (byte)READ_LE_UINT32(&(roomhdr->v8.numObjects)); else if (_version == 7) - _numObjectsInRoom = READ_LE_UINT16(&(roomhdr->v7.numObjects)); + _numObjectsInRoom = (byte) READ_LE_UINT16(&(roomhdr->v7.numObjects)); else - _numObjectsInRoom = READ_LE_UINT16(&(roomhdr->old.numObjects)); + _numObjectsInRoom = (byte) READ_LE_UINT16(&(roomhdr->old.numObjects)); if (_numObjectsInRoom == 0) return; @@ -645,7 +645,7 @@ void Scumm::loadRoomObjectsSmall() { room = getResourceAddress(rtRoom, _roomResource); roomhdr = (const RoomHeader *)findResourceData(MKID('RMHD'), room); - _numObjectsInRoom = READ_LE_UINT16(&(roomhdr->old.numObjects)); + _numObjectsInRoom = (byte) READ_LE_UINT16(&(roomhdr->old.numObjects)); if (_numObjectsInRoom == 0) return; @@ -773,7 +773,7 @@ void Scumm::setupRoomObject(ObjectData *od, const byte *room, const byte *search od->y_pos = READ_LE_UINT16(&imhd->v7.y_pos); od->width = READ_LE_UINT16(&imhd->v7.width); od->height = READ_LE_UINT16(&imhd->v7.height); - od->actordir = READ_LE_UINT16(&imhd->v7.actordir); + od->actordir = (byte) READ_LE_UINT16(&imhd->v7.actordir); } else if (_version == 6) { od->obj_nr = READ_LE_UINT16(&(cdhd->v6.obj_id)); @@ -933,7 +933,7 @@ const byte *Scumm::getObjOrActorName(int obj) { else if (_features & GF_OLD_BUNDLE) offset = *(objptr + 16); else - offset = READ_LE_UINT16(objptr + 18); + offset = (byte) READ_LE_UINT16(objptr + 18); return (objptr + offset); } |