diff options
| author | Eugene Sandulenko | 2013-12-11 21:41:00 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-12-11 21:41:00 +0200 |
| commit | 185cf9ea3c3b40d88baeadae9f7e65f842d3596d (patch) | |
| tree | a41c38221dae048408fed4814e4fa146e4ef3796 /engines/fullpipe | |
| parent | d39b2280f2bd4bc5b1dccb9f77b10b82479154e5 (diff) | |
| download | scummvm-rg350-185cf9ea3c3b40d88baeadae9f7e65f842d3596d.tar.gz scummvm-rg350-185cf9ea3c3b40d88baeadae9f7e65f842d3596d.tar.bz2 scummvm-rg350-185cf9ea3c3b40d88baeadae9f7e65f842d3596d.zip | |
FULLPIPE: Add calls to callback1 in Movement::gotoNextFrame()
Diffstat (limited to 'engines/fullpipe')
| -rw-r--r-- | engines/fullpipe/statics.cpp | 4 | ||||
| -rw-r--r-- | engines/fullpipe/statics.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp index 8324e0f322..b97e7f8ca1 100644 --- a/engines/fullpipe/statics.cpp +++ b/engines/fullpipe/statics.cpp @@ -1570,7 +1570,7 @@ void Movement::removeFirstPhase() { _updateFlag1 = 0; } -bool Movement::gotoNextFrame(int callback1, void (*callback2)(int *)) { +bool Movement::gotoNextFrame(void (*callback1)(int, Common::Point *point, int, int), void (*callback2)(int *)) { debug(8, "Movement::gotoNextFrame()"); if (!callback2) { @@ -1622,7 +1622,7 @@ bool Movement::gotoNextFrame(int callback1, void (*callback2)(int *)) { if (_currMovement->_framePosOffsets) { if (callback1) { point = *_currMovement->_framePosOffsets[_currDynamicPhaseIndex]; - //callback1(_currDynamicPhaseIndex, &point, _ox, _oy); + callback1(_currDynamicPhaseIndex, &point, _ox, _oy); _ox += deltax - point.x; _oy += point.y; diff --git a/engines/fullpipe/statics.h b/engines/fullpipe/statics.h index 15de4ab3be..c8537dfa97 100644 --- a/engines/fullpipe/statics.h +++ b/engines/fullpipe/statics.h @@ -155,7 +155,7 @@ class Movement : public GameObject { int calcDuration(); void removeFirstPhase(); - bool gotoNextFrame(int callback1, void (*callback2)(int *)); + bool gotoNextFrame(void (*_callback1)(int, Common::Point *point, int, int), void (*callback2)(int *)); bool gotoPrevFrame(); void gotoFirstFrame(); void gotoLastFrame(); @@ -174,7 +174,7 @@ class StaticANIObject : public GameObject { int16 _field_32; int _field_34; int _initialCounter; - int _callback1; + void (*_callback1)(int, Common::Point *point, int, int); void (*_callback2)(int *); PtrList _movements; PtrList _staticsList; |