aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2014-05-21 08:07:21 +0300
committerEugene Sandulenko2014-05-21 08:08:22 +0300
commit347c03d8b7c8768dc58f5f42ff013c426f7acebb (patch)
tree443727b424922d63bafca0ac3b2adefebd8d2860
parent29eda4c02e52279c9be4edf5764a41c8d2a9e88a (diff)
downloadscummvm-rg350-347c03d8b7c8768dc58f5f42ff013c426f7acebb.tar.gz
scummvm-rg350-347c03d8b7c8768dc58f5f42ff013c426f7acebb.tar.bz2
scummvm-rg350-347c03d8b7c8768dc58f5f42ff013c426f7acebb.zip
FULLPIPE: Fix method return types
-rw-r--r--engines/fullpipe/motion.cpp8
-rw-r--r--engines/fullpipe/motion.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 0e60847bc9..6162537dba 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -606,7 +606,7 @@ Common::Array<MovItem *> *MovGraph::method28(StaticANIObject *ani, int x, int y,
return 0;
}
-int MovGraph::method2C(StaticANIObject *obj, int x, int y) {
+bool MovGraph::method2C(StaticANIObject *obj, int x, int y) {
obj->setOXY(x, y);
return method3C(obj, 1);
}
@@ -3258,17 +3258,17 @@ int startWalkTo(int objId, int objKey, int x, int y, int fuzzyMatch) {
return 0;
}
-int doSomeAnimation(int objId, int objKey, int a3) {
+bool doSomeAnimation(int objId, int objKey, int a3) {
StaticANIObject *ani = g_fp->_currentScene->getStaticANIObject1ById(objId, objKey);
MctlCompound *cmp = getCurrSceneSc2MotionController();
if (ani && cmp)
return cmp->method3C(ani, a3);
- return 0;
+ return false;
}
-int doSomeAnimation2(int objId, int objKey) {
+bool doSomeAnimation2(int objId, int objKey) {
return doSomeAnimation(objId, objKey, 0);
}
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index aa40379717..76eb567cfe 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -34,8 +34,8 @@ class ExCommand2;
struct MovItem;
int startWalkTo(int objId, int objKey, int x, int y, int a5);
-int doSomeAnimation(int objId, int objKey, int a3);
-int doSomeAnimation2(int objId, int objKey);
+bool doSomeAnimation(int objId, int objKey, int a3);
+bool doSomeAnimation2(int objId, int objKey);
class MotionController : public CObject {
public:
@@ -54,7 +54,7 @@ public:
virtual int removeObject(StaticANIObject *obj) { return 0; }
virtual void freeItems() {}
virtual Common::Array<MovItem *> *method28(StaticANIObject *ani, int x, int y, int flag1, int *rescount) { return 0; }
- virtual int method2C(StaticANIObject *obj, int x, int y) { return 0; }
+ virtual bool method2C(StaticANIObject *obj, int x, int y) { return false; }
virtual int method30() { return 0; }
virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) { return 0; }
virtual int changeCallback() { return 0; }
@@ -362,7 +362,7 @@ public:
virtual int removeObject(StaticANIObject *obj);
virtual void freeItems();
virtual Common::Array<MovItem *> *method28(StaticANIObject *ani, int x, int y, int flag1, int *rescount);
- virtual int method2C(StaticANIObject *obj, int x, int y);
+ virtual bool method2C(StaticANIObject *obj, int x, int y);
virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
virtual int changeCallback();
virtual bool method3C(StaticANIObject *ani, int flag);