diff options
Diffstat (limited to 'object.cpp')
| -rw-r--r-- | object.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/object.cpp b/object.cpp index 79bea00fbb..23ba1fc87b 100644 --- a/object.cpp +++ b/object.cpp @@ -17,6 +17,9 @@ * * Change Log: * $Log$ + * Revision 1.4 2001/10/16 12:20:18 strigeus + * made files compile on unix + * * Revision 1.3 2001/10/16 10:01:47 strigeus * preliminary DOTT support * @@ -401,10 +404,10 @@ void Scumm::loadRoomObjects() { _objs[i].obj_nr = READ_LE_UINT16(&cdhd->obj_id); #if defined(DOTT) - _objs[i].numstrips = cdhd->w>>3; - _objs[i].height = cdhd->h>>3; - _objs[i].x_pos = cdhd->x>>3; - _objs[i].y_pos = cdhd->y>>3; + _objs[i].numstrips = READ_LE_UINT16(&cdhd->w)>>3; + _objs[i].height = READ_LE_UINT16(&cdhd->h)>>3; + _objs[i].x_pos = ((int16)READ_LE_UINT16(&cdhd->x))>>3; + _objs[i].y_pos = ((int16)READ_LE_UINT16(&cdhd->y))>>3; #else _objs[i].numstrips = cdhd->w; _objs[i].height = cdhd->h; @@ -758,4 +761,4 @@ int Scumm::getDistanceBetween(bool is_obj_1, int b, int c, bool is_obj_2, int e, return getDist(x,y,x2,y2) * 0xFF / ((i + j)>>1); } -#endif
\ No newline at end of file +#endif |