aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2014-06-23 15:54:28 +0300
committerEugene Sandulenko2014-06-23 15:54:28 +0300
commit2a09159c2b0ff338e2e96491f897094ccdd6b273 (patch)
tree44c3cd35125ad25909e1ae69c366d593b2ba6098 /engines
parenta493355af3c06c1104d7a2f892b3323b499a66da (diff)
downloadscummvm-rg350-2a09159c2b0ff338e2e96491f897094ccdd6b273.tar.gz
scummvm-rg350-2a09159c2b0ff338e2e96491f897094ccdd6b273.tar.bz2
scummvm-rg350-2a09159c2b0ff338e2e96491f897094ccdd6b273.zip
FULLPIPE: Give better name to function
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/motion.cpp6
-rw-r--r--engines/fullpipe/motion.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 1b7141f067..2d2fdfa3bf 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -1470,7 +1470,7 @@ Common::Array<MovArr *> *MovGraph::genMovArr(int x, int y, int *arrSize, int fla
return arr;
}
-void MovGraph::shuffleTree(MovGraphLink *lnk, MovGraphLink *lnk2, Common::Array<MovGraphLink *> &tempObList1, Common::Array<MovGraphLink *> &allPaths) {
+void MovGraph::findAllPaths(MovGraphLink *lnk, MovGraphLink *lnk2, Common::Array<MovGraphLink *> &tempObList1, Common::Array<MovGraphLink *> &allPaths) {
if (lnk == lnk2) {
for (uint i = 0; i < tempObList1.size(); i++)
allPaths.push_back(tempObList1[i]);
@@ -1492,7 +1492,7 @@ void MovGraph::shuffleTree(MovGraphLink *lnk, MovGraphLink *lnk2, Common::Array<
}
if (!(l->_flags & 0xA0000000))
- shuffleTree(l, lnk2, tempObList1, allPaths);
+ findAllPaths(l, lnk2, tempObList1, allPaths);
}
lnk->_flags &= 0x7FFFFFFF;
@@ -1505,7 +1505,7 @@ Common::Array<MovItem *> *MovGraph::calcMovItems(MovArr *currPos, MovArr *destPo
Common::Array<MovGraphLink *> allPaths;
// Get all paths between two edges of the graph
- shuffleTree(currPos->_link, destPos->_link, tempObList1, allPaths);
+ findAllPaths(currPos->_link, destPos->_link, tempObList1, allPaths);
*pathCount = 0;
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 2cbf999f86..3c0a05bbe7 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -370,7 +370,7 @@ public:
MovGraphNode *calcOffset(int ox, int oy);
int getItemIndexByStaticAni(StaticANIObject *ani);
Common::Array<MovArr *> *genMovArr(int x, int y, int *arrSize, int flag1, int flag2);
- void shuffleTree(MovGraphLink *lnk, MovGraphLink *lnk2, Common::Array<MovGraphLink *> &tempObList1, Common::Array<MovGraphLink *> &tempObList2);
+ void findAllPaths(MovGraphLink *lnk, MovGraphLink *lnk2, Common::Array<MovGraphLink *> &tempObList1, Common::Array<MovGraphLink *> &tempObList2);
Common::Array<MovItem *> *calcMovItems(MovArr *movarr1, MovArr *movarr2, int *listCount);
void genMovItem(MovItem *movitem, MovGraphLink *grlink, MovArr *movarr1, MovArr *movarr2);
bool calcChunk(int idx, int x, int y, MovArr *arr, int a6);