aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/gameloader.cpp4
-rw-r--r--engines/fullpipe/scenes.cpp16
-rw-r--r--engines/fullpipe/scenes.h8
-rw-r--r--engines/fullpipe/scenes/scene18and19.cpp28
4 files changed, 29 insertions, 27 deletions
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index e172b9b0f2..d9f7327a6b 100644
--- a/engines/fullpipe/gameloader.cpp
+++ b/engines/fullpipe/gameloader.cpp
@@ -272,7 +272,7 @@ bool preloadCallback(PreloadItem &pre, int flag) {
g_fp->_currSoundList1[0] = g_fp->accessScene(SC_COMMON)->_soundList;
}
- g_vars->scene18_var01 = 0;
+ g_vars->scene18_inScene18p1 = false;
if ((pre.preloadId1 != SC_18 || pre.sceneId != SC_19) && (pre.preloadId1 != SC_19 || (pre.sceneId != SC_18 && pre.sceneId != SC_19))) {
if (g_fp->_scene3) {
@@ -284,7 +284,7 @@ bool preloadCallback(PreloadItem &pre, int flag) {
} else {
scene19_setMovements(g_fp->accessScene(pre.preloadId1), pre.keyCode);
- g_vars->scene18_var01 = 1;
+ g_vars->scene18_inScene18p1 = true;
if (pre.preloadId1 == SC_18) {
g_fp->_gameLoader->saveScenePicAniInfos(SC_18);
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 8cbacea012..f2435bfa19 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -270,15 +270,15 @@ Vars::Vars() {
scene17_handPhase = false;
scene17_sceneEdgeX = 0;
- scene18_var01 = 0;
+ scene18_inScene18p1 = false;
scene18_whirlgig = 0;
scene18_var20 = 1032;
scene18_var04 = -318;
scene18_bridgeIsConvoluted = false;
- scene18_var09 = 0;
+ scene18_whirlgigMovMum = 0;
scene18_girlIsSwinging = false;
- scene18_var21 = 0;
- scene18_var11 = 0;
+ scene18_rotationCounter = 0;
+ scene18_manY = 0;
scene18_var12 = false;
scene18_wheelIsTurning = true;
scene18_var23 = -1;
@@ -796,7 +796,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
scene->preloadMovements(sceneVar);
g_fp->stopAllSounds();
- if (g_vars->scene18_var01)
+ if (g_vars->scene18_inScene18p1)
scene18_initScene1(scene);
else
scene18_initScene2(scene);
@@ -812,10 +812,12 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
if (!g_fp->_scene3) {
g_fp->_scene3 = accessScene(SC_18);
g_fp->_gameLoader->loadScene(SC_18);
+
scene18_initScene2(g_fp->_scene3);
scene18_preload();
scene19_setMovements(g_fp->_scene3, entrance->_field_4);
- g_vars->scene18_var01 = 1;
+
+ g_vars->scene18_inScene18p1 = true;
}
scene19_preload();
@@ -823,7 +825,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
scene->preloadMovements(sceneVar);
g_fp->stopAllSounds();
- if (g_vars->scene18_var01)
+ if (g_vars->scene18_inScene18p1)
scene18_initScene1(scene);
else
scene19_initScene2();
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index f9b4079079..1dfcf0e89f 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -473,16 +473,16 @@ public:
bool scene17_handPhase;
int scene17_sceneEdgeX;
- int scene18_var01;
+ bool scene18_inScene18p1;
StaticANIObject *scene18_whirlgig;
Common::Array<Swinger *> scene18_swingers;
int scene18_var20;
int scene18_var04;
bool scene18_bridgeIsConvoluted;
- int scene18_var09;
+ int scene18_whirlgigMovMum;
bool scene18_girlIsSwinging;
- int scene18_var21;
- int scene18_var11;
+ int scene18_rotationCounter;
+ int scene18_manY;
bool scene18_var12;
bool scene18_wheelIsTurning;
int scene18_var23;
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 11d00a0cbd..649c41e891 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -107,7 +107,7 @@ void scene19_setMovements(Scene *sc, int entranceId) {
}
if (g_vars->scene18_whirlgig->_movement) {
- g_vars->scene18_var09 = g_vars->scene18_whirlgig->_movement->_currDynamicPhaseIndex + 1;
+ g_vars->scene18_whirlgigMovMum = g_vars->scene18_whirlgig->_movement->_currDynamicPhaseIndex + 1;
int mx;
@@ -116,10 +116,10 @@ void scene19_setMovements(Scene *sc, int entranceId) {
else
mx = g_vars->scene18_whirlgig->_movement->_dynamicPhases.size();
- if (g_vars->scene18_var09 > mx - 1)
- g_vars->scene18_var09 = -1;
+ if (g_vars->scene18_whirlgigMovMum > mx - 1)
+ g_vars->scene18_whirlgigMovMum = -1;
} else {
- g_vars->scene18_var09 = 0;
+ g_vars->scene18_whirlgigMovMum = 0;
}
sc->deleteStaticANIObject(g_vars->scene18_boy);
@@ -235,9 +235,9 @@ void scene18_initScene1(Scene *sc) {
go->setOXY(newx + go->_ox, newy + go->_oy);
}
- if (g_vars->scene18_bridgeIsConvoluted && g_vars->scene18_var09 != -1) {
+ if (g_vars->scene18_bridgeIsConvoluted && g_vars->scene18_whirlgigMovMum != -1) {
g_vars->scene18_whirlgig->startAnim(sc->_sceneId != SC_18 ? MV_WHR19_SPIN : MV_WHR18_SPIN, 0, -1);
- g_vars->scene18_whirlgig->_movement->setDynamicPhaseIndex(g_vars->scene18_var09);
+ g_vars->scene18_whirlgig->_movement->setDynamicPhaseIndex(g_vars->scene18_whirlgigMovMum);
}
int sndid;
@@ -321,7 +321,7 @@ void scene18_initScene2(Scene *sc) {
scene18_setupSwingers(armchair, sc);
- g_vars->scene18_var21 = 0;
+ g_vars->scene18_rotationCounter = 0;
g_vars->scene18_var12 = false;
g_vars->scene18_wheelIsTurning = true;
g_vars->scene18_var23 = -1;
@@ -356,7 +356,7 @@ int scene18_updateCursor() {
if (g_fp->_cursorId == PIC_CSR_ITN) {
if (g_fp->_objectIdAtCursor == PIC_SC18_LADDER1) {
- g_fp->_cursorId = (g_vars->scene18_var11 <= 250) ? PIC_CSR_GOD : PIC_CSR_GOU;
+ g_fp->_cursorId = (g_vars->scene18_manY <= 250) ? PIC_CSR_GOD : PIC_CSR_GOU;
} else if (g_fp->_objectIdAtCursor == PIC_SC18_LADDER2 || g_fp->_objectIdAtCursor == PIC_SC18_LADDER3) {
g_fp->_cursorId = PIC_CSR_GOU;
}
@@ -544,10 +544,10 @@ void sceneHandler18and19_manStandArmchair() {
}
void sceneHandler18and19_drawRiders() {
- g_vars->scene18_var21++;
+ g_vars->scene18_rotationCounter++;
- if (g_vars->scene18_var21 >= 359)
- g_vars->scene18_var21 = 0;
+ if (g_vars->scene18_rotationCounter >= 359)
+ g_vars->scene18_rotationCounter = 0;
for (uint i = 0; i < g_vars->scene18_swingers.size(); i++) {
Swinger *swinger = g_vars->scene18_swingers[i];
@@ -564,7 +564,7 @@ void sceneHandler18and19_drawRiders() {
int ix = g_vars->scene18_var20 - (int)(cos(swinger->angle) * -575.0);
int iy = g_vars->scene18_var04 - (int)(sin(swinger->angle) * -575.0) + 87;
- if (!g_vars->scene18_var21) {
+ if (!g_vars->scene18_rotationCounter) {
ix = swinger->sx;
iy = swinger->sy;
swinger->angle = (double)i * ANGLE(45);
@@ -765,7 +765,7 @@ int sceneHandler18(ExCommand *cmd) {
if (g_fp->_aniMan2) {
int x = g_fp->_aniMan2->_ox;
- g_vars->scene18_var11 = g_fp->_aniMan2->_oy;
+ g_vars->scene18_manY = g_fp->_aniMan2->_oy;
if (x < g_fp->_sceneRect.left + 200)
g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
@@ -891,7 +891,7 @@ int sceneHandler19(ExCommand *cmd) {
if (g_fp->_aniMan2) {
int x = g_fp->_aniMan2->_ox;
- g_vars->scene18_var11 = g_fp->_aniMan2->_oy;
+ g_vars->scene18_manY = g_fp->_aniMan2->_oy;
if (x < g_fp->_sceneRect.left + 200)
g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 00:21:18 +0000