diff options
| author | Max Horn | 2010-10-18 16:00:07 +0000 |
|---|---|---|
| committer | Max Horn | 2010-10-18 16:00:07 +0000 |
| commit | 3b21db16188899eac9914fe1c3b32b311a3aa344 (patch) | |
| tree | cb30447b471bbdc5cb54783624f2cd9754aac6cf /engines/scumm/object.cpp | |
| parent | 35af08619df28db3a3487523a6cb5cc202b4c87e (diff) | |
| download | scummvm-rg350-3b21db16188899eac9914fe1c3b32b311a3aa344.tar.gz scummvm-rg350-3b21db16188899eac9914fe1c3b32b311a3aa344.tar.bz2 scummvm-rg350-3b21db16188899eac9914fe1c3b32b311a3aa344.zip | |
SCUMM: Fix parts of bug #3087898 (SCUMM: Code analysis warnings)
svn-id: r53567
Diffstat (limited to 'engines/scumm/object.cpp')
| -rw-r--r-- | engines/scumm/object.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/scumm/object.cpp b/engines/scumm/object.cpp index e2b68f8d3b..60c3a9336e 100644 --- a/engines/scumm/object.cpp +++ b/engines/scumm/object.cpp @@ -993,6 +993,7 @@ void ScummEngine::resetRoomObject(ObjectData *od, const byte *room, const byte * od->flags = Gdi::dbAllowMaskOr; if (_game.version == 8) { + assert(imhd); od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id)); od->parent = cdhd->v7.parent; @@ -1008,6 +1009,7 @@ void ScummEngine::resetRoomObject(ObjectData *od, const byte *room, const byte * od->flags = ((((byte)READ_LE_UINT32(&imhd->v8.flags)) & 16) == 0) ? Gdi::dbAllowMaskOr : 0; } else if (_game.version == 7) { + assert(imhd); od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id)); od->parent = cdhd->v7.parent; @@ -1020,6 +1022,7 @@ void ScummEngine::resetRoomObject(ObjectData *od, const byte *room, const byte * od->actordir = (byte)READ_LE_UINT16(&imhd->v7.actordir); } else if (_game.version == 6) { + assert(imhd); od->obj_nr = READ_LE_UINT16(&(cdhd->v6.obj_id)); od->width = READ_LE_UINT16(&cdhd->v6.w); |