diff options
| author | Eugene Sandulenko | 2014-05-23 09:41:54 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2014-05-23 09:41:54 +0300 |
| commit | 1d46172008ce117f078e271054753d7d6be67cba (patch) | |
| tree | 60956153171e3533d4bd73c516f9ca9bfbc01cf3 /engines/fullpipe | |
| parent | 2ac8dfeeedc7a6860fa7c3491c50d1cec1ac653a (diff) | |
| download | scummvm-rg350-1d46172008ce117f078e271054753d7d6be67cba.tar.gz scummvm-rg350-1d46172008ce117f078e271054753d7d6be67cba.tar.bz2 scummvm-rg350-1d46172008ce117f078e271054753d7d6be67cba.zip | |
FULLPIPE: Implement MovGraph::changeCallback()
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/motion.cpp | 6 | ||||
| -rw-r--r-- | engines/fullpipe/motion.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp index 3f17c638f4..2ee3d706bb 100644 --- a/engines/fullpipe/motion.cpp +++ b/engines/fullpipe/motion.cpp @@ -684,10 +684,8 @@ MessageQueue *MovGraph::method34(StaticANIObject *ani, int xpos, int ypos, int f return method50(ani, _callback1(ani, movitems, count), staticsId); } -int MovGraph::changeCallback() { - warning("STUB: MovGraph::changeCallback()"); - - return 0; +void MovGraph::changeCallback(Common::Array<MovArr *> *(*callback1)(StaticANIObject *ani, Common::Array<MovItem *> *items, signed int counter)) { + _callback1 = callback1; } bool MovGraph::method3C(StaticANIObject *ani, int flag) { diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h index 76eb567cfe..6233174e67 100644 --- a/engines/fullpipe/motion.h +++ b/engines/fullpipe/motion.h @@ -31,6 +31,7 @@ class MctlConnectionPoint; class MovGraphLink; class MessageQueue; class ExCommand2; +struct MovArr; struct MovItem; int startWalkTo(int objId, int objKey, int x, int y, int a5); @@ -57,7 +58,7 @@ public: 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; } + virtual void changeCallback(Common::Array<MovArr *> *(*_callback1)(StaticANIObject *ani, Common::Array<MovItem *> *items, signed int counter)) {} virtual bool method3C(StaticANIObject *ani, int flag) { return 0; } virtual int method40() { return 0; } virtual bool method44(StaticANIObject *ani, int x, int y) { return false; } @@ -364,7 +365,7 @@ public: virtual Common::Array<MovItem *> *method28(StaticANIObject *ani, int x, int y, int flag1, int *rescount); 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 void changeCallback(Common::Array<MovArr *> *(*_callback1)(StaticANIObject *ani, Common::Array<MovItem *> *items, signed int counter)); virtual bool method3C(StaticANIObject *ani, int flag); virtual bool method44(StaticANIObject *ani, int x, int y); virtual MessageQueue *doWalkTo(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId); |