libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 18:24:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FULLPIPE: Add calls to callback1 in Movement::gotoNextFrame()

Browse Source
This commit is contained in:
Eugene Sandulenko 2013-12-11 21:41:00 +02:00
parent d39b2280f2
commit 185cf9ea3c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/fullpipe/statics.cpp
View File

@ -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;

4
engines/fullpipe/statics.h
View File

@ -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;