diff options
| author | Eugene Sandulenko | 2013-09-09 00:36:42 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-09-09 00:38:07 +0300 |
| commit | b165dd8a06971d182c623d913f4306a945e7ecbc (patch) | |
| tree | 12ba7ed07d3c6c3454d29d23ba22fe1146d41f17 /engines | |
| parent | 693ed1e988e164b738e019aaf9e7b5999d2b14a4 (diff) | |
| download | scummvm-rg350-b165dd8a06971d182c623d913f4306a945e7ecbc.tar.gz scummvm-rg350-b165dd8a06971d182c623d913f4306a945e7ecbc.tar.bz2 scummvm-rg350-b165dd8a06971d182c623d913f4306a945e7ecbc.zip | |
FULLPIPE: Fix warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/fullpipe/interaction.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/fullpipe/interaction.cpp b/engines/fullpipe/interaction.cpp index 4153724b63..cdf39d29ae 100644 --- a/engines/fullpipe/interaction.cpp +++ b/engines/fullpipe/interaction.cpp @@ -472,8 +472,8 @@ bool CInteraction::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) { - if (!_staticsId1 || !(_flags & 1) || ani->_statics != 0 && ani->_statics->_staticsId == _staticsId1) + if (!_staticsId2 || (subj->_statics != 0 && subj->_statics->_staticsId == _staticsId2)) { + if (!_staticsId1 || !(_flags & 1) || (ani->_statics != 0 && ani->_statics->_staticsId == _staticsId1)) return true; } } |