diff options
author | Colin Snover | 2017-11-14 12:56:01 -0600 |
---|---|---|
committer | Eugene Sandulenko | 2017-11-18 22:35:12 +0100 |
commit | 8e8932f38d61789c76fd03a4a01e3cb74d3dc52d (patch) | |
tree | 53ecdd07e0133709d5b8e4ae6bb22c1ef0e3debd /engines/fullpipe/interaction.cpp | |
parent | 5c89c39325f271a5ef4dcb55fbc013b3858791d5 (diff) | |
download | scummvm-rg350-8e8932f38d61789c76fd03a4a01e3cb74d3dc52d.tar.gz scummvm-rg350-8e8932f38d61789c76fd03a4a01e3cb74d3dc52d.tar.bz2 scummvm-rg350-8e8932f38d61789c76fd03a4a01e3cb74d3dc52d.zip |
FULLPIPE: Remove unnecessary and illegal C-style casts
Diffstat (limited to 'engines/fullpipe/interaction.cpp')
-rw-r--r-- | engines/fullpipe/interaction.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index f13d826879..4e3a3a3d86 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -172,7 +172,10 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject return false; if (!inter->_objectId2) { - StaticANIObject *ani = (StaticANIObject *)obj; + if (obj->_objtype != kObjTypeStaticANIObject) + return false; + + StaticANIObject *ani = static_cast<StaticANIObject *>(obj); if (!ani->isIdle()) return false; @@ -521,9 +524,14 @@ bool Interaction::isOverlapping(StaticANIObject *subj, GameObject *obj) { if (abs(_xOffs + obj->_ox - subj->_ox) <= 1 && abs(obj->_oy + _yOffs - subj->_oy) <= 1) { if (!_staticsId2 || (subj->_statics != 0 && subj->_statics->_staticsId == _staticsId2)) { - StaticANIObject *ani = dynamic_cast<StaticANIObject *>(obj); - if (!_staticsId1 || !(_flags & 1) || (ani && ani->_statics != 0 && ani->_statics->_staticsId == _staticsId1)) + if (!_staticsId1 || !(_flags & 1)) return true; + + if (obj->_objtype == kObjTypeStaticANIObject) { + const StaticANIObject *ani = static_cast<StaticANIObject *>(obj); + if (ani->_statics != 0 && ani->_statics->_staticsId == _staticsId1) + return true; + } } } return false; |