thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FULLPIPE: Fix memory leaks and unnecessary indirect allocations in Motion and Sc2

Browse source
This commit is contained in:
Colin Snover 2017-11-15 16:24:37 -06:00 • committed by Eugene Sandulenko
parent ca5a86e703
commit bb26bf7994
20 changed files with 259 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/fullpipe/interaction.cpp
View file

@ -129,7 +129,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
PicAniInfo aniInfo;
obj->getPicAniInfo(&aniInfo);
obj->getPicAniInfo(aniInfo);
if (cinter->_staticsId1 && obj->_objtype == kObjTypeStaticANIObject) {
StaticANIObject *ani = static_cast<StaticANIObject *>(obj);
@ -139,7 +139,7 @@ bool InteractionController::handleInteraction(StaticANIObject *subj, GameObject
int xpos = cinter->_xOffs + obj->_ox;
int ypos = cinter->_yOffs + obj->_oy;
obj->setPicAniInfo(&aniInfo);
obj->setPicAniInfo(aniInfo);
if (abs(xpos - subj->_ox) > 1 || abs(ypos - subj->_oy) > 1) {
debugC(0, kDebugPathfinding, "Calling makeQueue() at [%d, %d]", xpos, ypos);
@ -298,7 +298,7 @@ LABEL_38:
bool someFlag = false;
PicAniInfo aniInfo;
obj->getPicAniInfo(&aniInfo);
obj->getPicAniInfo(aniInfo);
if (obj->_objtype == kObjTypeStaticANIObject && inter->_staticsId1) {
StaticANIObject *ani = static_cast<StaticANIObject *>(obj);
@ -310,7 +310,7 @@ LABEL_38:
int xpos = inter->_xOffs + obj->_ox;
int ypos = inter->_yOffs + obj->_oy;
obj->setPicAniInfo(&aniInfo);
obj->setPicAniInfo(aniInfo);
if (abs(xpos - subj->_ox) > 1 || abs(ypos - subj->_oy) > 1
|| (inter->_staticsId2 != 0 && (subj->_statics == 0 || subj->_statics->_staticsId != inter->_staticsId2))) {