diff options
| author | Paweł Kołodziejski | 2002-12-25 07:48:37 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2002-12-25 07:48:37 +0000 |
| commit | 4c83d9ed06192d0fe9d9c264187a74f532944f51 (patch) | |
| tree | ab70fa820069c5bd5e38a8c7953f79f4b52fd866 /scumm/object.cpp | |
| parent | e1a416c031061d42acd0eee009b292ea1199513e (diff) | |
| download | scummvm-rg350-4c83d9ed06192d0fe9d9c264187a74f532944f51.tar.gz scummvm-rg350-4c83d9ed06192d0fe9d9c264187a74f532944f51.tar.bz2 scummvm-rg350-4c83d9ed06192d0fe9d9c264187a74f532944f51.zip | |
fixed warnings(errors) for VC6.
Endy I'm here now ! :-)
svn-id: r6115
Diffstat (limited to 'scumm/object.cpp')
| -rw-r--r-- | scumm/object.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scumm/object.cpp b/scumm/object.cpp index a8639f4f86..55ac3da319 100644 --- a/scumm/object.cpp +++ b/scumm/object.cpp @@ -407,7 +407,7 @@ void Scumm::loadRoomObjects() roomhdr = (RoomHeader *)findResourceData(MKID('RMHD'), room); if (_features & GF_AFTER_V8) - _numObjectsInRoom = READ_LE_UINT32(&(roomhdr->v8.numObjects)); + _numObjectsInRoom = (byte)READ_LE_UINT32(&(roomhdr->v8.numObjects)); else if (_features & GF_AFTER_V7) _numObjectsInRoom = READ_LE_UINT16(&(roomhdr->v7.numObjects)); else @@ -594,11 +594,11 @@ void Scumm::setupRoomObject(ObjectData *od, byte *room) od->parentstate = cdhd->v7.parentstate; imhd = (ImageHeader *)findResourceData(MKID('IMHD'), room + od->offs_obim_to_room); - od->x_pos = READ_LE_UINT32(&imhd->v8.x_pos); - od->y_pos = READ_LE_UINT32(&imhd->v8.y_pos); - od->width = READ_LE_UINT32(&imhd->v8.width); - od->height = READ_LE_UINT32(&imhd->v8.height); - od->actordir = READ_LE_UINT32(&imhd->v8.actordir); + od->x_pos = (int)READ_LE_UINT32(&imhd->v8.x_pos); + od->y_pos = (int)READ_LE_UINT32(&imhd->v8.y_pos); + od->width = (uint)READ_LE_UINT32(&imhd->v8.width); + od->height = (uint)READ_LE_UINT32(&imhd->v8.height); + od->actordir = (byte)READ_LE_UINT32(&imhd->v8.actordir); } else if (_features & GF_AFTER_V7) { od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id)); |