diff options
| author | Strangerke | 2014-06-06 23:18:01 +0200 |
|---|---|---|
| committer | Strangerke | 2014-06-06 23:18:01 +0200 |
| commit | 3dcfa95b44ec47c6eff1de03f946e2ac20bed29e (patch) | |
| tree | 89118fd00f572e59656468a89682bc77e174ec13 /engines/fullpipe/statics.cpp | |
| parent | 8cb50b52e0e6614343419ca75803c8a18cf085df (diff) | |
| parent | 113a2824c41283facd7ae6c24be3f74213207bc9 (diff) | |
| download | scummvm-rg350-3dcfa95b44ec47c6eff1de03f946e2ac20bed29e.tar.gz scummvm-rg350-3dcfa95b44ec47c6eff1de03f946e2ac20bed29e.tar.bz2 scummvm-rg350-3dcfa95b44ec47c6eff1de03f946e2ac20bed29e.zip | |
Merge branch 'master' of github.com:scummvm/scummvm
Diffstat (limited to 'engines/fullpipe/statics.cpp')
| -rw-r--r-- | engines/fullpipe/statics.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index 5d7de050f0..ec8514143e 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -979,11 +979,12 @@ void StaticANIObject::stopAnim_maybe() { _ox += point.x; _oy += point.y; } + } else { + _statics = _movement->_staticsObj2; } - } - - if (_movement->_currDynamicPhaseIndex || !(_flags & 0x40)) + } else { _statics = _movement->_staticsObj2; + } _statics->getSomeXY(point); |