[Scummvm-cvs-logs] scummvm master -> 761e45bd64e6a4f2b2b8b0794242150e4a4820b0
sev-
sev at scummvm.org
Wed Dec 18 23:44:28 CET 2013
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
6055acb63b FULLPIPE: Implement sceneHandler06_sub09()
0b187a7937 FULLPIPE: Implement sceneHandler06_setExits()
f85d40b2a3 FULLPIPE: Some renames in scene06
f2f867a131 FULLPIPE: Give meaningful names to vars in scene06
3ebcd3fcf7 FULLPIPE: Last renamings in scene06
761e45bd64 FULLPIPE: Implement MovGraph::method2C()
Commit: 6055acb63bfa1d1c6310ff14e4143a0d934546f7
https://github.com/scummvm/scummvm/commit/6055acb63bfa1d1c6310ff14e4143a0d934546f7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-18T14:43:37-08:00
Commit Message:
FULLPIPE: Implement sceneHandler06_sub09()
Changed paths:
engines/fullpipe/constants.h
engines/fullpipe/scenes/scene06.cpp
diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index d1e1820..1a41538 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -269,6 +269,7 @@ namespace Fullpipe {
#define QU_KOZAW_WALK 505
#define QU_MOM_JUMPBK 671
#define QU_MOM_JUMPFW 670
+#define QU_MOM_PUTBALL 2903
#define QU_MOM_SITDOWN 685
#define QU_MOM_STANDUP 2899
#define QU_MOM_TOLIFT 2902
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index 4f76714..7f49df3 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -419,7 +419,54 @@ void sceneHandler06_sub05() {
}
void sceneHandler06_sub09() {
- warning("STUB: sceneHandler06_sub09()");
+ if (g_vars->scene06_var11) {
+ g_vars->scene06_var11->hide();
+
+ g_vars->scene06_balls.push_back(g_vars->scene06_var11);
+
+ g_vars->scene06_var11 = 0;
+
+ g_vars->scene06_var13++;
+
+ if (g_vars->scene06_mumsy->_movement) {
+ Common::Point point;
+
+ if (g_vars->scene06_mumsy->_movement->_id == MV_MOM_JUMPFW) {
+ if (g_vars->scene06_mumsy->_movement->_currDynamicPhaseIndex <= 5) {
+ g_vars->scene06_mumsy->_movement->calcSomeXY(point, 0);
+
+ point.x = -point.x;
+ point.y = -point.y;
+ } else {
+ g_vars->scene06_mumsy->_movement->calcSomeXY(point, 1);
+
+ g_vars->scene06_mumsyPos++;
+ }
+ } else if (g_vars->scene06_mumsy->_movement->_id == MV_MOM_JUMPBK) {
+ if (g_vars->scene06_mumsy->_movement->_currDynamicPhaseIndex <= 4) {
+ g_vars->scene06_mumsy->_movement->calcSomeXY(point, 0);
+
+ point.x = -point.x;
+ point.y = -point.y;
+ } else {
+ g_vars->scene06_mumsy->_movement->calcSomeXY(point, 1);
+
+ g_vars->scene06_mumsyPos--;
+ }
+ }
+
+ g_vars->scene06_mumsy->changeStatics2(ST_MOM_STANDS);
+ g_vars->scene06_mumsy->setOXY(point.x + g_vars->scene06_mumsy->_ox,
+ point.y + g_vars->scene06_mumsy->_oy);
+ } else {
+ g_vars->scene06_mumsy->changeStatics2(ST_MOM_STANDS);
+ }
+
+ chainQueue(QU_MOM_PUTBALL, 1);
+ g_vars->scene06_var16 = 1;
+
+ sceneHandler06_sub10();
+ }
}
void sceneHandler06_sub04(int par) {
@@ -437,10 +484,6 @@ void sceneHandler06_sub04(int par) {
}
}
-void sceneHandler06_sub06() {
- warning("STUB: sceneHandler06_sub06()");
-}
-
void scene06_initScene(Scene *sc) {
g_vars->scene06_mumsy = sc->getStaticANIObject1ById(ANI_MAMASHA, -1);
g_vars->scene06_var06 = 0;
Commit: 0b187a7937d612bfc764e95689c28299c7f1d138
https://github.com/scummvm/scummvm/commit/0b187a7937d612bfc764e95689c28299c7f1d138
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-18T14:43:37-08:00
Commit Message:
FULLPIPE: Implement sceneHandler06_setExits()
Changed paths:
engines/fullpipe/motion.cpp
engines/fullpipe/motion.h
engines/fullpipe/scenes/scene06.cpp
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 2dd0258..116d58a 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -42,6 +42,10 @@ bool MotionController::load(MfcArchive &file) {
return true;
}
+void MotionController::enableLinks(const char *linkName, bool enable) {
+ warning("STUB: MotionController::enableLinks()");
+}
+
bool MctlCompound::load(MfcArchive &file) {
debug(5, "MctlCompound::load()");
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index e5b5928..96c0a4f 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -59,6 +59,8 @@ public:
virtual int method44() { return 0; }
virtual int method48() { return -1; }
virtual MessageQueue *doWalkTo(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) { return 0; }
+
+ void enableLinks(const char *linkName, bool enable);
};
class MovGraphReact : public CObject {
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index 7f49df3..e23b34d 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -69,7 +69,10 @@ int scene06_updateCursor() {
}
void sceneHandler06_setExits(Scene *sc) {
- warning("STUB: sceneHandler06_setExits()");
+ MotionController *mc = getSc2MctlCompoundBySceneId(sc->_sceneId);
+
+ mc->enableLinks(sO_CloseThing, (g_fullpipe->getObjectState(sO_BigMumsy) != g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsGone)));
+ mc->enableLinks(sO_CloseThing2, (g_vars->scene06_var07 != 0));
}
void sceneHandler06_winArcade() {
Commit: f85d40b2a34243f13a8c14bf95576ccd919d448b
https://github.com/scummvm/scummvm/commit/f85d40b2a34243f13a8c14bf95576ccd919d448b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-18T14:43:38-08:00
Commit Message:
FULLPIPE: Some renames in scene06
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene06.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index b4a8625..f9861ec 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -115,12 +115,12 @@ Vars::Vars() {
scene06_var03 = 0;
scene06_var04 = 0;
scene06_mumsy = 0;
- scene06_var06 = 0;
+ scene06_someBall = 0;
scene06_invHandle = 0;
scene06_liftButton = 0;
scene06_ballDrop = 0;
- scene06_var07 = 0;
- scene06_var08 = 0;
+ scene06_arcadeEnabled = false;
+ scene06_aimingBall = false;
scene06_currentBall = 0;
scene06_var10 = 0;
scene06_var11 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 8f404d2..83702c7 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -152,12 +152,12 @@ public:
int scene06_var02;
int scene06_var03;
int scene06_var04;
- StaticANIObject *scene06_var06;
+ StaticANIObject *scene06_someBall;
StaticANIObject *scene06_invHandle;
StaticANIObject *scene06_liftButton;
StaticANIObject *scene06_ballDrop;
- int scene06_var07;
- int scene06_var08;
+ bool scene06_arcadeEnabled;
+ bool scene06_aimingBall;
StaticANIObject *scene06_currentBall;
StaticANIObject *scene06_var10;
StaticANIObject *scene06_var11;
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index e23b34d..28f2ddb 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -47,8 +47,8 @@ void scene06_initMumsy() {
int scene06_updateCursor() {
g_fullpipe->updateCursorCommon();
- if (g_vars->scene06_var07) {
- if (g_vars->scene06_var08) {
+ if (g_vars->scene06_arcadeEnabled) {
+ if (g_vars->scene06_aimingBall) {
g_fullpipe->_cursorId = PIC_CSR_ARCADE2_D;
return PIC_CSR_ARCADE2_D;
@@ -72,7 +72,7 @@ void sceneHandler06_setExits(Scene *sc) {
MotionController *mc = getSc2MctlCompoundBySceneId(sc->_sceneId);
mc->enableLinks(sO_CloseThing, (g_fullpipe->getObjectState(sO_BigMumsy) != g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsGone)));
- mc->enableLinks(sO_CloseThing2, (g_vars->scene06_var07 != 0));
+ mc->enableLinks(sO_CloseThing2, g_vars->scene06_arcadeEnabled);
}
void sceneHandler06_winArcade() {
@@ -81,17 +81,17 @@ void sceneHandler06_winArcade() {
if (g_fullpipe->getObjectState(sO_ClockAxis) == g_fullpipe->getObjectEnumState(sO_ClockAxis, sO_IsNotAvailable))
g_fullpipe->setObjectState(sO_ClockAxis, g_fullpipe->getObjectEnumState(sO_ClockAxis, sO_WithoutHandle));
- if (g_vars->scene06_var07) {
+ if (g_vars->scene06_arcadeEnabled) {
g_fullpipe->_aniMan->_callback2 = 0;
g_fullpipe->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
- if (g_vars->scene06_var06) {
- g_vars->scene06_var06->_flags &= 0xFFFB;
+ if (g_vars->scene06_someBall) {
+ g_vars->scene06_someBall->_flags &= 0xFFFB;
- g_vars->scene06_balls.push_back(g_vars->scene06_var06);
+ g_vars->scene06_balls.push_back(g_vars->scene06_someBall);
- g_vars->scene06_var06 = 0;
+ g_vars->scene06_someBall = 0;
}
if (g_vars->scene06_var11) {
@@ -110,8 +110,8 @@ void sceneHandler06_winArcade() {
g_vars->scene06_var10 = 0;
}
- g_vars->scene06_var07 = 0;
- g_vars->scene06_var08 = 0;
+ g_vars->scene06_arcadeEnabled = false;
+ g_vars->scene06_aimingBall = false;
}
g_vars->scene06_mumsy->_flags &= 0xFFFB;
@@ -130,7 +130,7 @@ void sceneHandler06_enableDrops() {
chainQueue(QU_MOM_STANDUP, 1);
- g_vars->scene06_var07 = 1;
+ g_vars->scene06_arcadeEnabled = true;
g_vars->scene06_numBallsGiven = 0;
g_vars->scene06_mumsyPos = 0;
g_vars->scene06_var13 = 0;
@@ -226,7 +226,7 @@ void sceneHandler06_mumsyBallTake() {
mq->chain(0);
g_vars->scene06_var13 = 0;
- g_vars->scene06_var07 = 0;
+ g_vars->scene06_arcadeEnabled = false;
g_fullpipe->_aniMan2 = 0;
}
@@ -280,7 +280,8 @@ void sceneHandler06_installHandle() {
int sceneHandler06_updateScreenCallback() {
int res;
- res = g_fullpipe->drawArcadeOverlay(g_vars->scene06_var07);
+ res = g_fullpipe->drawArcadeOverlay(g_vars->scene06_arcadeEnabled);
+
if (!res)
g_fullpipe->_updateScreenCallback = 0;
@@ -327,7 +328,7 @@ void sceneHandler06_takeBall() {
}
}
-void sceneHandler06_sub02() {
+void sceneHandler06_aiming() {
if (g_vars->scene06_var10) {
g_vars->scene06_var17 = 4 * g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex + 16;
g_vars->scene06_var18 = 5 * (g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex + 4);
@@ -335,7 +336,7 @@ void sceneHandler06_sub02() {
if (g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex < 4) {
g_fullpipe->_aniMan->_movement->setDynamicPhaseIndex(11);
- g_vars->scene06_var08 = 0;
+ g_vars->scene06_aimingBall = false;
return;
}
@@ -343,7 +344,7 @@ void sceneHandler06_sub02() {
g_fullpipe->_aniMan->_movement->setDynamicPhaseIndex(9);
}
- g_vars->scene06_var08 = 0;
+ g_vars->scene06_aimingBall = false;
}
void sceneHandler06_sub07() {
@@ -357,7 +358,7 @@ void sceneHandler06_sub07() {
}
void sceneHandler06_throwCallback(int *arg) {
- if (g_vars->scene06_var08) {
+ if (g_vars->scene06_aimingBall) {
int dist = (g_fullpipe->_mouseVirtY - g_vars->scene06_sceneClickY)
* (g_fullpipe->_mouseVirtY - g_vars->scene06_sceneClickY)
+ (g_fullpipe->_mouseVirtX - g_vars->scene06_sceneClickX)
@@ -378,12 +379,13 @@ void sceneHandler06_throwBall() {
g_fullpipe->_aniMan->_callback2 = sceneHandler06_throwCallback;
g_fullpipe->_aniMan->startAnim(MV_MAN6_THROWBALL, 0, -1);
- g_vars->scene06_var08 = 1;
+ g_vars->scene06_aimingBall = true;
}
-void sceneHandler06_sub03() {
+void sceneHandler06_eggieWalk() {
if (15 - g_vars->scene06_numBallsGiven >= 4 && !g_fullpipe->_rnd->getRandomNumber(9)) {
StaticANIObject *ani = g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_EGGIE, -1);
+
if (!ani || !(ani->_flags & 4)) {
if (g_vars->scene06_var15)
chainQueue(QU_EGG6_GOR, 0);
@@ -396,7 +398,7 @@ void sceneHandler06_sub03() {
}
}
-void sceneHandler06_sub10() {
+void sceneHandler06_dropBall() {
if (g_vars->scene06_numBallsGiven >= 15 || g_vars->scene06_var13 >= 5)
g_vars->scene06_ballDrop->hide();
else
@@ -417,8 +419,8 @@ void sceneHandler06_sub05() {
g_vars->scene06_var11 = 0;
- sceneHandler06_sub10();
- sceneHandler06_sub03();
+ sceneHandler06_dropBall();
+ sceneHandler06_eggieWalk();
}
void sceneHandler06_sub09() {
@@ -468,7 +470,7 @@ void sceneHandler06_sub09() {
chainQueue(QU_MOM_PUTBALL, 1);
g_vars->scene06_var16 = 1;
- sceneHandler06_sub10();
+ sceneHandler06_dropBall();
}
}
@@ -489,12 +491,12 @@ void sceneHandler06_sub04(int par) {
void scene06_initScene(Scene *sc) {
g_vars->scene06_mumsy = sc->getStaticANIObject1ById(ANI_MAMASHA, -1);
- g_vars->scene06_var06 = 0;
+ g_vars->scene06_someBall = 0;
g_vars->scene06_invHandle = sc->getStaticANIObject1ById(ANI_INV_HANDLE, -1);
g_vars->scene06_liftButton = sc->getStaticANIObject1ById(ANI_BUTTON_6, -1);
g_vars->scene06_ballDrop = sc->getStaticANIObject1ById(ANI_BALLDROP, -1);
- g_vars->scene06_var07 = 0;
- g_vars->scene06_var08 = 0;
+ g_vars->scene06_arcadeEnabled = false;
+ g_vars->scene06_aimingBall = false;
g_vars->scene06_currentBall = 0;
g_vars->scene06_var10 = 0;
g_vars->scene06_var11 = 0;
@@ -572,7 +574,7 @@ int sceneHandler06(ExCommand *ex) {
case MSG_SC6_TESTNUMBALLS:
g_vars->scene06_var16 = 0;
- if (g_vars->scene06_var13 < 5 || !g_vars->scene06_var07)
+ if (g_vars->scene06_var13 < 5 || !g_vars->scene06_arcadeEnabled)
return 0;
sceneHandler06_mumsyBallTake();
@@ -627,12 +629,12 @@ int sceneHandler06(ExCommand *ex) {
break;
case 30:
- if (g_vars->scene06_var08) {
- sceneHandler06_sub02();
+ if (g_vars->scene06_aimingBall) {
+ sceneHandler06_aiming();
break;
}
- if (!g_vars->scene06_var07) {
+ if (!g_vars->scene06_arcadeEnabled) {
// Do nothing
break;
}
@@ -643,7 +645,7 @@ int sceneHandler06(ExCommand *ex) {
StaticANIObject *st = g_fullpipe->_currentScene->getStaticANIObjectAtPos(ex->_sceneClickX, ex->_sceneClickY);
if (st) {
- if (!g_vars->scene06_var07 && st->_id == ANI_LIFTBUTTON) {
+ if (!g_vars->scene06_arcadeEnabled && st->_id == ANI_LIFTBUTTON) {
g_fullpipe->lift_sub1(st);
ex->_messageKind = 0;
return 0;
@@ -690,7 +692,7 @@ int sceneHandler06(ExCommand *ex) {
g_vars->scene06_var01 = ox;
g_vars->scene06_var02 = oy;
- if (g_vars->scene06_var07 && oy <= 470 && ox >= 1088) {
+ if (g_vars->scene06_arcadeEnabled && oy <= 470 && ox >= 1088) {
if (ox < g_fullpipe->_sceneRect.left + 600) {
g_fullpipe->_currentScene->_x = ox - g_fullpipe->_sceneRect.left - 700;
ox = g_vars->scene06_var01;
@@ -710,7 +712,7 @@ int sceneHandler06(ExCommand *ex) {
res = 1;
}
- if (g_vars->scene06_var07) {
+ if (g_vars->scene06_arcadeEnabled) {
if (g_vars->scene06_mumsyPos > -3)
g_vars->scene06_mumsyJumpBk->_percent = g_vars->scene06_mumsyJumpBkPercent;
else
@@ -721,10 +723,11 @@ int sceneHandler06(ExCommand *ex) {
else
g_vars->scene06_mumsyJumpFw->_percent = 0;
- if (g_vars->scene06_var08) {
+ if (g_vars->scene06_aimingBall) {
g_vars->scene06_var14++;
+
if (g_vars->scene06_var14 >= 600)
- sceneHandler06_sub03();
+ sceneHandler06_eggieWalk();
}
} else {
g_vars->scene06_mumsyJumpFw->_percent = 0;
@@ -744,7 +747,7 @@ int sceneHandler06(ExCommand *ex) {
sceneHandler06_sub04(g_vars->scene06_var17);
}
- if (g_vars->scene06_var07
+ if (g_vars->scene06_arcadeEnabled
&& !g_vars->scene06_currentBall
&& !g_vars->scene06_var10
&& !g_vars->scene06_var11
Commit: f2f867a13195018337f073d369ea11433620a12a
https://github.com/scummvm/scummvm/commit/f2f867a13195018337f073d369ea11433620a12a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-18T14:43:38-08:00
Commit Message:
FULLPIPE: Give meaningful names to vars in scene06
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene06.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index f9861ec..08eed72 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -110,10 +110,10 @@ Vars::Vars() {
scene05_handleFlipper = 0;
scene05_floatersTicker = 0;
- scene06_var01 = 0;
- scene06_var02 = 0;
- scene06_var03 = 0;
- scene06_var04 = 0;
+ scene06_manX = 0;
+ scene06_manY = 0;
+ scene06_ballX = 0;
+ scene06_ballY = 0;
scene06_mumsy = 0;
scene06_someBall = 0;
scene06_invHandle = 0;
@@ -122,15 +122,15 @@ Vars::Vars() {
scene06_arcadeEnabled = false;
scene06_aimingBall = false;
scene06_currentBall = 0;
- scene06_var10 = 0;
- scene06_var11 = 0;
+ scene06_ballInHands = 0;
+ scene06_flyingBall = 0;
scene06_numBallsGiven = 0;
- scene06_var13 = 0;
- scene06_var14 = 0;
- scene06_var15 = 1;
- scene06_var16 = 0;
- scene06_var17 = 0;
- scene06_var18 = 0;
+ scene06_mumsyNumBalls = 0;
+ scene06_eggieTimeout = 0;
+ scene06_eggieDirection = true;
+ scene06_mumsyGotBall = 0;
+ scene06_ballDeltaX = 0;
+ scene06_ballDeltaY = 0;
scene06_sceneClickX = 0;
scene06_sceneClickY = 0;
scene06_mumsyPos = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 83702c7..6664d82 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -148,10 +148,10 @@ public:
int scene05_floatersTicker;
StaticANIObject *scene06_mumsy;
- int scene06_var01;
- int scene06_var02;
- int scene06_var03;
- int scene06_var04;
+ int scene06_manX;
+ int scene06_manY;
+ int scene06_ballX;
+ int scene06_ballY;
StaticANIObject *scene06_someBall;
StaticANIObject *scene06_invHandle;
StaticANIObject *scene06_liftButton;
@@ -159,16 +159,16 @@ public:
bool scene06_arcadeEnabled;
bool scene06_aimingBall;
StaticANIObject *scene06_currentBall;
- StaticANIObject *scene06_var10;
- StaticANIObject *scene06_var11;
+ StaticANIObject *scene06_ballInHands;
+ StaticANIObject *scene06_flyingBall;
Common::Array<StaticANIObject *> scene06_balls;
int scene06_numBallsGiven;
- int scene06_var13;
- int scene06_var14;
- int scene06_var15;
- int scene06_var16;
- int scene06_var17;
- int scene06_var18;
+ int scene06_mumsyNumBalls;
+ int scene06_eggieTimeout;
+ int scene06_eggieDirection;
+ int scene06_mumsyGotBall;
+ int scene06_ballDeltaX;
+ int scene06_ballDeltaY;
int scene06_sceneClickX;
int scene06_sceneClickY;
int scene06_mumsyPos;
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index 28f2ddb..f2f5e30 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -94,20 +94,20 @@ void sceneHandler06_winArcade() {
g_vars->scene06_someBall = 0;
}
- if (g_vars->scene06_var11) {
- g_vars->scene06_var11->_flags &= 0xFFFB;
+ if (g_vars->scene06_flyingBall) {
+ g_vars->scene06_flyingBall->_flags &= 0xFFFB;
- g_vars->scene06_balls.push_back(g_vars->scene06_var11);
+ g_vars->scene06_balls.push_back(g_vars->scene06_flyingBall);
- g_vars->scene06_var11 = 0;
+ g_vars->scene06_flyingBall = 0;
}
- if (g_vars->scene06_var10) {
- g_vars->scene06_var10->_flags &= 0xFFFB;
+ if (g_vars->scene06_ballInHands) {
+ g_vars->scene06_ballInHands->_flags &= 0xFFFB;
- g_vars->scene06_balls.push_back(g_vars->scene06_var10);
+ g_vars->scene06_balls.push_back(g_vars->scene06_ballInHands);
- g_vars->scene06_var10 = 0;
+ g_vars->scene06_ballInHands = 0;
}
g_vars->scene06_arcadeEnabled = false;
@@ -133,8 +133,8 @@ void sceneHandler06_enableDrops() {
g_vars->scene06_arcadeEnabled = true;
g_vars->scene06_numBallsGiven = 0;
g_vars->scene06_mumsyPos = 0;
- g_vars->scene06_var13 = 0;
- g_vars->scene06_var16 = 0;
+ g_vars->scene06_mumsyNumBalls = 0;
+ g_vars->scene06_mumsyGotBall = false;
sceneHandler06_setExits(g_fullpipe->_currentScene);
}
@@ -142,7 +142,7 @@ void sceneHandler06_enableDrops() {
void sceneHandler06_mumsyBallTake() {
int momAni = 0;
- switch (g_vars->scene06_var13) {
+ switch (g_vars->scene06_mumsyNumBalls) {
case 1:
momAni = MV_MOM_TAKE1;
break;
@@ -167,7 +167,7 @@ void sceneHandler06_mumsyBallTake() {
ex->_excFlags = 2u;
mq->addExCommandToEnd(ex);
- if (g_vars->scene06_var13 >= 5) {
+ if (g_vars->scene06_mumsyNumBalls >= 5) {
g_fullpipe->setObjectState(sO_BigMumsy, g_fullpipe->getObjectEnumState(sO_BigMumsy, sO_IsGone));
if (g_fullpipe->getObjectState(sO_ClockAxis) == g_fullpipe->getObjectEnumState(sO_ClockAxis, sO_IsNotAvailable))
@@ -225,7 +225,7 @@ void sceneHandler06_mumsyBallTake() {
mq->setFlags(mq->getFlags() | 1);
mq->chain(0);
- g_vars->scene06_var13 = 0;
+ g_vars->scene06_mumsyNumBalls = 0;
g_vars->scene06_arcadeEnabled = false;
g_fullpipe->_aniMan2 = 0;
@@ -294,7 +294,7 @@ void sceneHandler06_sub08() {
g_fullpipe->_aniMan->startAnim(MV_MAN6_TAKEBALL, 0, -1);
- g_vars->scene06_var10 = g_vars->scene06_currentBall;
+ g_vars->scene06_ballInHands = g_vars->scene06_currentBall;
g_vars->scene06_currentBall = 0;
if (getCurrSceneSc2MotionController()->_isEnabled)
@@ -329,9 +329,9 @@ void sceneHandler06_takeBall() {
}
void sceneHandler06_aiming() {
- if (g_vars->scene06_var10) {
- g_vars->scene06_var17 = 4 * g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex + 16;
- g_vars->scene06_var18 = 5 * (g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex + 4);
+ if (g_vars->scene06_ballInHands) {
+ g_vars->scene06_ballDeltaX = 4 * g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex + 16;
+ g_vars->scene06_ballDeltaY = 5 * (g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex + 4);
if (g_fullpipe->_aniMan->_movement->_currDynamicPhaseIndex < 4) {
g_fullpipe->_aniMan->_movement->setDynamicPhaseIndex(11);
@@ -348,12 +348,12 @@ void sceneHandler06_aiming() {
}
void sceneHandler06_sub07() {
- if (g_vars->scene06_var10) {
- g_vars->scene06_var11 = g_vars->scene06_var10;
- g_vars->scene06_var10 = 0;
- g_vars->scene06_var11->show1(g_fullpipe->_aniMan->_ox - 60, g_fullpipe->_aniMan->_oy - 60, -1, 0);
+ if (g_vars->scene06_ballInHands) {
+ g_vars->scene06_flyingBall = g_vars->scene06_ballInHands;
+ g_vars->scene06_ballInHands = 0;
+ g_vars->scene06_flyingBall->show1(g_fullpipe->_aniMan->_ox - 60, g_fullpipe->_aniMan->_oy - 60, -1, 0);
- g_vars->scene06_var11->_priority = 27;
+ g_vars->scene06_flyingBall->_priority = 27;
}
}
@@ -387,51 +387,51 @@ void sceneHandler06_eggieWalk() {
StaticANIObject *ani = g_fullpipe->_currentScene->getStaticANIObject1ById(ANI_EGGIE, -1);
if (!ani || !(ani->_flags & 4)) {
- if (g_vars->scene06_var15)
+ if (g_vars->scene06_eggieDirection)
chainQueue(QU_EGG6_GOR, 0);
else
chainQueue(QU_EGG6_GOL, 0);
- g_vars->scene06_var14 = 0;
- g_vars->scene06_var15 = (g_vars->scene06_var15 == 0);
+ g_vars->scene06_eggieTimeout = 0;
+ g_vars->scene06_eggieDirection = !g_vars->scene06_eggieDirection;
}
}
}
void sceneHandler06_dropBall() {
- if (g_vars->scene06_numBallsGiven >= 15 || g_vars->scene06_var13 >= 5)
+ if (g_vars->scene06_numBallsGiven >= 15 || g_vars->scene06_mumsyNumBalls >= 5)
g_vars->scene06_ballDrop->hide();
else
chainQueue(QU_SC6_DROPS3, 0);
}
void sceneHandler06_sub05() {
- g_vars->scene06_var04 = 475;
+ g_vars->scene06_ballY = 475;
- g_vars->scene06_var11->setOXY(g_vars->scene06_var03, g_vars->scene06_var04);
+ g_vars->scene06_flyingBall->setOXY(g_vars->scene06_ballX, g_vars->scene06_ballY);
MessageQueue *mq = new MessageQueue(g_fullpipe->_currentScene->getMessageQueueById(QU_SC6_FALLBALL), 0, 1);
- mq->replaceKeyCode(-1, g_vars->scene06_var11->_okeyCode);
+ mq->replaceKeyCode(-1, g_vars->scene06_flyingBall->_okeyCode);
mq->chain(0);
- g_vars->scene06_balls.push_back(g_vars->scene06_var11);
+ g_vars->scene06_balls.push_back(g_vars->scene06_flyingBall);
- g_vars->scene06_var11 = 0;
+ g_vars->scene06_flyingBall = 0;
sceneHandler06_dropBall();
sceneHandler06_eggieWalk();
}
void sceneHandler06_sub09() {
- if (g_vars->scene06_var11) {
- g_vars->scene06_var11->hide();
+ if (g_vars->scene06_flyingBall) {
+ g_vars->scene06_flyingBall->hide();
- g_vars->scene06_balls.push_back(g_vars->scene06_var11);
+ g_vars->scene06_balls.push_back(g_vars->scene06_flyingBall);
- g_vars->scene06_var11 = 0;
+ g_vars->scene06_flyingBall = 0;
- g_vars->scene06_var13++;
+ g_vars->scene06_mumsyNumBalls++;
if (g_vars->scene06_mumsy->_movement) {
Common::Point point;
@@ -468,7 +468,7 @@ void sceneHandler06_sub09() {
}
chainQueue(QU_MOM_PUTBALL, 1);
- g_vars->scene06_var16 = 1;
+ g_vars->scene06_mumsyGotBall = true;
sceneHandler06_dropBall();
}
@@ -477,8 +477,8 @@ void sceneHandler06_sub09() {
void sceneHandler06_sub04(int par) {
int pixel;
- if (g_vars->scene06_var04 <= 475) {
- if (g_vars->scene06_mumsy->getPixelAtPos(g_vars->scene06_var03, g_vars->scene06_var04, &pixel)) {
+ if (g_vars->scene06_ballY <= 475) {
+ if (g_vars->scene06_mumsy->getPixelAtPos(g_vars->scene06_ballX, g_vars->scene06_ballY, &pixel)) {
if (pixel) {
chainObjQueue(g_vars->scene06_mumsy, QU_MOM_JUMPBK, 0);
sceneHandler06_sub09();
@@ -498,13 +498,13 @@ void scene06_initScene(Scene *sc) {
g_vars->scene06_arcadeEnabled = false;
g_vars->scene06_aimingBall = false;
g_vars->scene06_currentBall = 0;
- g_vars->scene06_var10 = 0;
- g_vars->scene06_var11 = 0;
+ g_vars->scene06_ballInHands = 0;
+ g_vars->scene06_flyingBall = 0;
g_vars->scene06_balls.clear();
g_vars->scene06_numBallsGiven = 0;
- g_vars->scene06_var13 = 0;
- g_vars->scene06_var14 = 0;
- g_vars->scene06_var15 = 1;
+ g_vars->scene06_mumsyNumBalls = 0;
+ g_vars->scene06_eggieTimeout = 0;
+ g_vars->scene06_eggieDirection = true;
StaticANIObject *ball = sc->getStaticANIObject1ById(ANI_NEWBALL, -1);
@@ -572,9 +572,9 @@ int sceneHandler06(ExCommand *ex) {
break;
case MSG_SC6_TESTNUMBALLS:
- g_vars->scene06_var16 = 0;
+ g_vars->scene06_mumsyGotBall = false;
- if (g_vars->scene06_var13 < 5 || !g_vars->scene06_arcadeEnabled)
+ if (g_vars->scene06_mumsyNumBalls < 5 || !g_vars->scene06_arcadeEnabled)
return 0;
sceneHandler06_mumsyBallTake();
@@ -656,7 +656,7 @@ int sceneHandler06(ExCommand *ex) {
sceneHandler06_takeBall();
ex->_messageKind = 0;
- } else if (g_vars->scene06_var10 && g_fullpipe->_aniMan == st && !g_fullpipe->_aniMan->_movement && g_fullpipe->_aniMan->_statics->_staticsId == ST_MAN6_BALL) {
+ } else if (g_vars->scene06_ballInHands && g_fullpipe->_aniMan == st && !g_fullpipe->_aniMan->_movement && g_fullpipe->_aniMan->_statics->_staticsId == ST_MAN6_BALL) {
g_vars->scene06_sceneClickX = ex->_sceneClickX;
g_vars->scene06_sceneClickY = ex->_sceneClickY;
@@ -689,13 +689,13 @@ int sceneHandler06(ExCommand *ex) {
int ox = g_fullpipe->_aniMan2->_ox;
int oy = g_fullpipe->_aniMan2->_oy;
- g_vars->scene06_var01 = ox;
- g_vars->scene06_var02 = oy;
+ g_vars->scene06_manX = ox;
+ g_vars->scene06_manY = oy;
if (g_vars->scene06_arcadeEnabled && oy <= 470 && ox >= 1088) {
if (ox < g_fullpipe->_sceneRect.left + 600) {
g_fullpipe->_currentScene->_x = ox - g_fullpipe->_sceneRect.left - 700;
- ox = g_vars->scene06_var01;
+ ox = g_vars->scene06_manX;
}
if (ox > g_fullpipe->_sceneRect.right - 50)
@@ -703,7 +703,7 @@ int sceneHandler06(ExCommand *ex) {
} else {
if (ox < g_fullpipe->_sceneRect.left + 200) {
g_fullpipe->_currentScene->_x = ox - g_fullpipe->_sceneRect.left - 300;
- ox = g_vars->scene06_var01;
+ ox = g_vars->scene06_manX;
}
if (ox > g_fullpipe->_sceneRect.right - 200)
@@ -724,9 +724,9 @@ int sceneHandler06(ExCommand *ex) {
g_vars->scene06_mumsyJumpFw->_percent = 0;
if (g_vars->scene06_aimingBall) {
- g_vars->scene06_var14++;
+ g_vars->scene06_eggieTimeout++;
- if (g_vars->scene06_var14 >= 600)
+ if (g_vars->scene06_eggieTimeout >= 600)
sceneHandler06_eggieWalk();
}
} else {
@@ -734,27 +734,27 @@ int sceneHandler06(ExCommand *ex) {
g_vars->scene06_mumsyJumpBk->_percent = 0;
}
- if (g_vars->scene06_var11) {
- g_vars->scene06_var03 = g_vars->scene06_var11->_ox - g_vars->scene06_var17;
- g_vars->scene06_var04 = g_vars->scene06_var11->_oy - g_vars->scene06_var18;
+ if (g_vars->scene06_flyingBall) {
+ g_vars->scene06_ballX = g_vars->scene06_flyingBall->_ox - g_vars->scene06_ballDeltaX;
+ g_vars->scene06_ballY = g_vars->scene06_flyingBall->_oy - g_vars->scene06_ballDeltaY;
- g_vars->scene06_var11->setOXY(g_vars->scene06_var03, g_vars->scene06_var04);
+ g_vars->scene06_flyingBall->setOXY(g_vars->scene06_ballX, g_vars->scene06_ballY);
- if (g_vars->scene06_var17 >= 2)
- g_vars->scene06_var17 -= 2;
+ if (g_vars->scene06_ballDeltaX >= 2)
+ g_vars->scene06_ballDeltaX -= 2;
- g_vars->scene06_var18 -= 5;
+ g_vars->scene06_ballDeltaY -= 5;
- sceneHandler06_sub04(g_vars->scene06_var17);
+ sceneHandler06_sub04(g_vars->scene06_ballDeltaX);
}
if (g_vars->scene06_arcadeEnabled
&& !g_vars->scene06_currentBall
- && !g_vars->scene06_var10
- && !g_vars->scene06_var11
+ && !g_vars->scene06_ballInHands
+ && !g_vars->scene06_flyingBall
&& g_vars->scene06_numBallsGiven >= 15
&& !g_vars->scene06_ballDrop->_movement
&& !g_vars->scene06_mumsy->_movement
- && !g_vars->scene06_var16)
+ && !g_vars->scene06_mumsyGotBall)
sceneHandler06_mumsyBallTake();
g_fullpipe->_behaviorManager->updateBehaviors();
g_fullpipe->startSceneTrack();
Commit: 3ebcd3fcf738d1d8f6625e0fde9b1ce317eb0717
https://github.com/scummvm/scummvm/commit/3ebcd3fcf738d1d8f6625e0fde9b1ce317eb0717
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-18T14:43:38-08:00
Commit Message:
FULLPIPE: Last renamings in scene06
Changed paths:
engines/fullpipe/scenes/scene06.cpp
diff --git a/engines/fullpipe/scenes/scene06.cpp b/engines/fullpipe/scenes/scene06.cpp
index f2f5e30..5bbd280 100644
--- a/engines/fullpipe/scenes/scene06.cpp
+++ b/engines/fullpipe/scenes/scene06.cpp
@@ -288,7 +288,7 @@ int sceneHandler06_updateScreenCallback() {
return res;
}
-void sceneHandler06_sub08() {
+void sceneHandler06_startAiming() {
if (g_vars->scene06_currentBall) {
g_vars->scene06_currentBall->hide();
@@ -323,7 +323,7 @@ void sceneHandler06_takeBall() {
postExCommand(g_fullpipe->_aniMan->_id, 2, 1158, 452, 0, -1);
}
} else {
- sceneHandler06_sub08();
+ sceneHandler06_startAiming();
}
}
}
@@ -347,7 +347,7 @@ void sceneHandler06_aiming() {
g_vars->scene06_aimingBall = false;
}
-void sceneHandler06_sub07() {
+void sceneHandler06_ballStartFly() {
if (g_vars->scene06_ballInHands) {
g_vars->scene06_flyingBall = g_vars->scene06_ballInHands;
g_vars->scene06_ballInHands = 0;
@@ -371,7 +371,7 @@ void sceneHandler06_throwCallback(int *arg) {
} else {
*arg = *arg + 1;
if (*arg == 12)
- sceneHandler06_sub07();
+ sceneHandler06_ballStartFly();
}
}
@@ -405,7 +405,7 @@ void sceneHandler06_dropBall() {
chainQueue(QU_SC6_DROPS3, 0);
}
-void sceneHandler06_sub05() {
+void sceneHandler06_fallBall() {
g_vars->scene06_ballY = 475;
g_vars->scene06_flyingBall->setOXY(g_vars->scene06_ballX, g_vars->scene06_ballY);
@@ -423,7 +423,7 @@ void sceneHandler06_sub05() {
sceneHandler06_eggieWalk();
}
-void sceneHandler06_sub09() {
+void sceneHandler06_catchBall() {
if (g_vars->scene06_flyingBall) {
g_vars->scene06_flyingBall->hide();
@@ -474,18 +474,19 @@ void sceneHandler06_sub09() {
}
}
-void sceneHandler06_sub04(int par) {
+void sceneHandler06_checkBallTarget(int par) {
int pixel;
if (g_vars->scene06_ballY <= 475) {
if (g_vars->scene06_mumsy->getPixelAtPos(g_vars->scene06_ballX, g_vars->scene06_ballY, &pixel)) {
if (pixel) {
chainObjQueue(g_vars->scene06_mumsy, QU_MOM_JUMPBK, 0);
- sceneHandler06_sub09();
+
+ sceneHandler06_catchBall();
}
}
} else {
- sceneHandler06_sub05();
+ sceneHandler06_fallBall();
}
}
@@ -745,7 +746,7 @@ int sceneHandler06(ExCommand *ex) {
g_vars->scene06_ballDeltaY -= 5;
- sceneHandler06_sub04(g_vars->scene06_ballDeltaX);
+ sceneHandler06_checkBallTarget(g_vars->scene06_ballDeltaX);
}
if (g_vars->scene06_arcadeEnabled
&& !g_vars->scene06_currentBall
Commit: 761e45bd64e6a4f2b2b8b0794242150e4a4820b0
https://github.com/scummvm/scummvm/commit/761e45bd64e6a4f2b2b8b0794242150e4a4820b0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-18T14:43:38-08:00
Commit Message:
FULLPIPE: Implement MovGraph::method2C()
Changed paths:
engines/fullpipe/motion.cpp
engines/fullpipe/motion.h
diff --git a/engines/fullpipe/motion.cpp b/engines/fullpipe/motion.cpp
index 116d58a..44cf550 100644
--- a/engines/fullpipe/motion.cpp
+++ b/engines/fullpipe/motion.cpp
@@ -440,10 +440,9 @@ int MovGraph::method28() {
return 0;
}
-int MovGraph::method2C() {
- warning("STUB: MovGraph::method2C()");
-
- return 0;
+int MovGraph::method2C(StaticANIObject *obj, int x, int y) {
+ obj->setOXY(x, y);
+ return method3C(obj, 1);
}
MessageQueue *MovGraph::method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId) {
@@ -458,7 +457,7 @@ int MovGraph::changeCallback() {
return 0;
}
-int MovGraph::method3C() {
+int MovGraph::method3C(StaticANIObject *ani, int flag) {
warning("STUB: MovGraph::method3C()");
return 0;
diff --git a/engines/fullpipe/motion.h b/engines/fullpipe/motion.h
index 96c0a4f..ee4ad02 100644
--- a/engines/fullpipe/motion.h
+++ b/engines/fullpipe/motion.h
@@ -50,11 +50,11 @@ public:
virtual int removeObject(StaticANIObject *obj) { return 0; }
virtual void freeItems() {}
virtual int method28() { return 0; }
- virtual int method2C() { return 0; }
+ virtual int method2C(StaticANIObject *obj, int x, int y) { return 0; }
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 int method3C() { return 0; }
+ virtual int method3C(StaticANIObject *ani, int flag) { return 0; }
virtual int method40() { return 0; }
virtual int method44() { return 0; }
virtual int method48() { return -1; }
@@ -317,10 +317,10 @@ public:
virtual int removeObject(StaticANIObject *obj);
virtual void freeItems();
virtual int method28();
- virtual int method2C();
+ virtual int method2C(StaticANIObject *obj, int x, int y);
virtual MessageQueue *method34(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
virtual int changeCallback();
- virtual int method3C();
+ virtual int method3C(StaticANIObject *ani, int flag);
virtual int method44();
virtual MessageQueue *doWalkTo(StaticANIObject *subj, int xpos, int ypos, int fuzzyMatch, int staticsId);
virtual int method50();
More information about the Scummvm-git-logs
mailing list