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/motion.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/motion.cpp')
| -rw-r--r-- | engines/fullpipe/motion.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index caac6d9e5a..adfc2f7326 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -554,8 +554,7 @@ MessageQueue *MctlLadder::doWalkTo(StaticANIObject *ani, int xpos, int ypos, int mq->transferExCommands(newmq); - if (newmq) - delete newmq; + delete newmq; ani->setPicAniInfo(&picinfo); @@ -1136,6 +1135,8 @@ MessageQueue *MovGraph::sub1(StaticANIObject *ani, int x, int y, int stid, int x _items[idx]->movarr._link = 0; res = fillMGMinfo(_items[idx]->ani, &_items[idx]->movarr, stid2); + + break; } } @@ -1517,6 +1518,8 @@ Common::Array<MovItem *> *MovGraph::calcMovItems(MovArr *movarr1, MovArr *movarr genMovItem(r, tempObList2[i], movarr1, movarr2); + res->push_back(r); + delete tempObList2[i]; } |