[Scummvm-cvs-logs] scummvm master -> 548dd029ee5c7da40d53c6f2a9979940745e2dc7
sev-
sev at scummvm.org
Sun Mar 16 21:42:05 CET 2014
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
60a41b76f2 FULLPIPE: More renames in scene18and19
9a6b72f28c FULLPIPE: More vars renamed in scene18
8bdea56720 FULLPIPE: Yet more renames in scene18 and 19
548dd029ee FULLPIPE: Last renames in scene18and19. This completes the scene
Commit: 60a41b76f299d7689ea085d68d2beed8f2a41126
https://github.com/scummvm/scummvm/commit/60a41b76f299d7689ea085d68d2beed8f2a41126
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-16T22:40:26+02:00
Commit Message:
FULLPIPE: More renames in scene18and19
Changed paths:
engines/fullpipe/gameloader.cpp
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene18and19.cpp
diff --git a/engines/fullpipe/gameloader.cpp b/engines/fullpipe/gameloader.cpp
index e172b9b..d9f7327 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 8cbacea..f2435bf 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 f9b4079..1dfcf0e 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 11d00a0..649c41e 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;
Commit: 9a6b72f28c68b44d8b0fa7eca8995bdf92820681
https://github.com/scummvm/scummvm/commit/9a6b72f28c68b44d8b0fa7eca8995bdf92820681
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-16T22:40:26+02:00
Commit Message:
FULLPIPE: More vars renamed in scene18
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene18and19.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index f2435bf..2695faf 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -272,8 +272,8 @@ Vars::Vars() {
scene18_inScene18p1 = false;
scene18_whirlgig = 0;
- scene18_var20 = 1032;
- scene18_var04 = -318;
+ scene18_wheelCenterX = 0;
+ scene18_wheelCenterY = 0;
scene18_bridgeIsConvoluted = false;
scene18_whirlgigMovMum = 0;
scene18_girlIsSwinging = false;
@@ -296,10 +296,10 @@ Vars::Vars() {
scene18_boy = 0;
scene18_girl = 0;
scene18_domino = 0;
- scene18_var29 = 290;
- scene18_var30 = -363;
- scene18_var05 = 283;
- scene18_var06 = -350;
+ scene18_boyJumpX = 290;
+ scene18_boyJumpY = -363;
+ scene18_girlJumpX = 283;
+ scene18_girlJumpY = -350;
scene19_enteredTruba3 = false;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 1dfcf0e..cf0b6b5 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -476,8 +476,8 @@ public:
bool scene18_inScene18p1;
StaticANIObject *scene18_whirlgig;
Common::Array<Swinger *> scene18_swingers;
- int scene18_var20;
- int scene18_var04;
+ int scene18_wheelCenterX;
+ int scene18_wheelCenterY;
bool scene18_bridgeIsConvoluted;
int scene18_whirlgigMovMum;
bool scene18_girlIsSwinging;
@@ -500,10 +500,10 @@ public:
StaticANIObject *scene18_boy;
StaticANIObject *scene18_girl;
StaticANIObject *scene18_domino;
- int scene18_var29;
- int scene18_var30;
- int scene18_var05;
- int scene18_var06;
+ int scene18_boyJumpX;
+ int scene18_boyJumpY;
+ int scene18_girlJumpX;
+ int scene18_girlJumpY;
bool scene19_enteredTruba3;
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 649c41e..7f20c1e 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -149,8 +149,8 @@ void scene18_setupSwingers(StaticANIObject *ani, Scene *sc) {
swinger = new Swinger;
swinger->angle = (double)i * ANGLE(45);
- swinger->sx = g_vars->scene18_var20 - (int)(cos(swinger->angle) * -575.0);
- swinger->sy = g_vars->scene18_var04 - (int)(sin(swinger->angle) * -575.0) + 87;
+ swinger->sx = g_vars->scene18_wheelCenterX - (int)(cos(swinger->angle) * -575.0);
+ swinger->sy = g_vars->scene18_wheelCenterY - (int)(sin(swinger->angle) * -575.0) + 87;
swinger->ix = swinger->sx;
swinger->iy = swinger->sy;
@@ -192,28 +192,28 @@ void scene18_setupSwingers(StaticANIObject *ani, Scene *sc) {
void scene18_initScene1(Scene *sc) {
PicAniInfo info;
- int oldx = g_vars->scene18_var20;
- int oldy = g_vars->scene18_var04;
+ int oldx = g_vars->scene18_wheelCenterX;
+ int oldy = g_vars->scene18_wheelCenterY;
g_vars->scene18_girlIsSwinging = (g_fp->getObjectState(sO_Girl) == g_fp->getObjectEnumState(sO_Girl, sO_IsSwinging));
if (sc->_sceneId == SC_18) {
g_vars->scene18_whirlgig = sc->getStaticANIObject1ById(ANI_WHIRLIGIG_18, -1);
- g_vars->scene18_var20 = 1032;
- g_vars->scene18_var04 = -318;
+ g_vars->scene18_wheelCenterX = 1032;
+ g_vars->scene18_wheelCenterY = -318;
} else {
g_vars->scene18_whirlgig = sc->getStaticANIObject1ById(ANI_WHIRLGIG_19, -1);
- g_vars->scene18_var20 = 1024;
- g_vars->scene18_var04 = 242;
+ g_vars->scene18_wheelCenterX = 1024;
+ g_vars->scene18_wheelCenterY = 242;
}
- int newx = g_vars->scene18_var20 - oldx;
- int newy = g_vars->scene18_var04 - oldy;
+ int newx = g_vars->scene18_wheelCenterX - oldx;
+ int newy = g_vars->scene18_wheelCenterY - oldy;
- g_vars->scene18_var29 += newx;
- g_vars->scene18_var30 += newy;
- g_vars->scene18_var05 += newx;
- g_vars->scene18_var06 += newy;
+ g_vars->scene18_boyJumpX += newx;
+ g_vars->scene18_boyJumpY += newy;
+ g_vars->scene18_girlJumpX += newx;
+ g_vars->scene18_girlJumpY += newy;
for (uint i = 0; i < g_vars->scene18_swingers.size(); i++) {
g_vars->scene18_swingers[i]->ani->getPicAniInfo(&info);
@@ -302,8 +302,8 @@ void scene18_initScene1(Scene *sc) {
void scene18_initScene2(Scene *sc) {
g_vars->scene18_whirlgig = sc->getStaticANIObject1ById(ANI_WHIRLIGIG_18, -1);
- g_vars->scene18_var20 = 1032;
- g_vars->scene18_var04 = -318;
+ g_vars->scene18_wheelCenterX = 1032;
+ g_vars->scene18_wheelCenterY = -318;
StaticANIObject *armchair = sc->getStaticANIObject1ById(ANI_KRESLO, -1);
@@ -336,10 +336,10 @@ void scene18_initScene2(Scene *sc) {
g_vars->scene18_boy = sc->getStaticANIObject1ById(ANI_BOY18, -1);
g_vars->scene18_girl = sc->getStaticANIObject1ById(ANI_GIRL18, -1);
g_vars->scene18_domino = sc->getStaticANIObject1ById(ANI_DOMINO_18, -1);
- g_vars->scene18_var29 = 290;
- g_vars->scene18_var30 = -363;
- g_vars->scene18_var05 = 283;
- g_vars->scene18_var06 = -350;
+ g_vars->scene18_boyJumpX = 290;
+ g_vars->scene18_boyJumpY = -363;
+ g_vars->scene18_girlJumpX = 283;
+ g_vars->scene18_girlJumpY = -350;
g_fp->initArcadeKeys("SC_18");
}
@@ -524,14 +524,14 @@ void sceneHandler18and19_showBoyJump() {
void sceneHandler18and19_boyJumpTo() {
g_vars->scene18_boy->stopAnim_maybe();
- g_vars->scene18_boy->show1(g_vars->scene18_var29, g_vars->scene18_var30, MV_BOY18_JUMPTO, 0);
+ g_vars->scene18_boy->show1(g_vars->scene18_boyJumpX, g_vars->scene18_boyJumpY, MV_BOY18_JUMPTO, 0);
g_vars->scene18_boy->_priority = 50;
g_vars->scene18_boy->startAnim(MV_BOY18_JUMPTO, 0, -1);
}
void sceneHandler18and19_girlJumpTo() {
g_vars->scene18_girl->stopAnim_maybe();
- g_vars->scene18_girl->show1(g_vars->scene18_var05, g_vars->scene18_var06, MV_GRL18_JUMPTO, 0);
+ g_vars->scene18_girl->show1(g_vars->scene18_girlJumpX, g_vars->scene18_girlJumpY, MV_GRL18_JUMPTO, 0);
g_vars->scene18_girl->_priority = 50;
g_vars->scene18_girl->startAnim(MV_GRL18_JUMPTO, 0, -1);
}
@@ -561,8 +561,8 @@ void sceneHandler18and19_drawRiders() {
oldangle -= ANGLE(360);
}
- 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;
+ int ix = g_vars->scene18_wheelCenterX - (int)(cos(swinger->angle) * -575.0);
+ int iy = g_vars->scene18_wheelCenterY - (int)(sin(swinger->angle) * -575.0) + 87;
if (!g_vars->scene18_rotationCounter) {
ix = swinger->sx;
Commit: 8bdea567208dc7e9a30abf84bbb5a1a27e1e8452
https://github.com/scummvm/scummvm/commit/8bdea567208dc7e9a30abf84bbb5a1a27e1e8452
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-16T22:40:26+02:00
Commit Message:
FULLPIPE: Yet more renames in scene18 and 19
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene18and19.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 2695faf..d741047 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -285,14 +285,14 @@ Vars::Vars() {
scene18_var24 = 0;
scene18_var25 = 0;
scene18_var26 = true;
- scene18_var27 = -1;
- scene18_var33 = 0;
scene18_jumpDistance = -1;
scene18_var14 = -1;
- scene18_var28 = 0;
+ scene18_manIsReady = false;
scene18_enteredTrubaRight = false;
- scene18_var31 = 0;
- scene18_var32 = 0;
+ scene18_manWheelPos = 0;
+ scene18_manWheelPosTo = -1;
+ scene18_kidWheelPos = 0;
+ scene18_kidWheelPosTo = 0;
scene18_boy = 0;
scene18_girl = 0;
scene18_domino = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index cf0b6b5..ce08f17 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -489,13 +489,13 @@ public:
int scene18_var24;
int scene18_var25;
bool scene18_var26;
- int scene18_var27;
- int scene18_var31;
- int scene18_var32;
- int scene18_var33;
+ int scene18_manWheelPos;
+ int scene18_manWheelPosTo;
+ int scene18_kidWheelPos;
+ int scene18_kidWheelPosTo;
int scene18_jumpDistance;
int scene18_var14;
- int scene18_var28;
+ bool scene18_manIsReady;
bool scene18_enteredTrubaRight;
StaticANIObject *scene18_boy;
StaticANIObject *scene18_girl;
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index 7f20c1e..e9911e7 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -294,7 +294,7 @@ void scene18_initScene1(Scene *sc) {
if (sc->_sceneId == SC_19)
g_fp->_aniMan2 = 0;
else
- g_fp->_aniMan2 = g_vars->scene18_swingers[g_vars->scene18_var27]->ani;
+ g_fp->_aniMan2 = g_vars->scene18_swingers[g_vars->scene18_manWheelPosTo]->ani;
} else {
g_fp->_aniMan2 = g_fp->_aniMan;
}
@@ -328,10 +328,10 @@ void scene18_initScene2(Scene *sc) {
g_vars->scene18_var24 = 0;
g_vars->scene18_var25 = 0;
g_vars->scene18_var26 = true;
- g_vars->scene18_var27 = -1;
+ g_vars->scene18_manWheelPosTo = -1;
g_vars->scene18_jumpDistance = -1;
g_vars->scene18_var14 = -1;
- g_vars->scene18_var28 = 0;
+ g_vars->scene18_manIsReady = false;
g_vars->scene18_enteredTrubaRight = 0;
g_vars->scene18_boy = sc->getStaticANIObject1ById(ANI_BOY18, -1);
g_vars->scene18_girl = sc->getStaticANIObject1ById(ANI_GIRL18, -1);
@@ -388,35 +388,35 @@ void sceneHandler18_clickBoard() {
postExCommand(g_fp->_aniMan->_id, 2, 967, 379, 0, -1);
} else {
- g_vars->scene18_var28 = 1;
+ g_vars->scene18_manIsReady = true;
}
}
-void sceneHandler18and19_showManJump() {
+void sceneHandler18_showManJumpTo() {
g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT);
g_fp->_aniMan->_flags &= 0xFFFB;
g_fp->_aniMan->_flags &= 0xFEFF;
- g_vars->scene18_swingers[g_vars->scene18_var27]->sflags = 0x20;
+ g_vars->scene18_swingers[g_vars->scene18_manWheelPosTo]->sflags = 0x20;
- g_vars->scene18_swingers[g_vars->scene18_var27]->ani->changeStatics2(ST_KSL_JUMPMAN);
- g_vars->scene18_swingers[g_vars->scene18_var27]->ani->startAnim(MV_KSL_INMAN, 0, -1);
- g_vars->scene18_swingers[g_vars->scene18_var27]->ani->_priority = 20;
+ g_vars->scene18_swingers[g_vars->scene18_manWheelPosTo]->ani->changeStatics2(ST_KSL_JUMPMAN);
+ g_vars->scene18_swingers[g_vars->scene18_manWheelPosTo]->ani->startAnim(MV_KSL_INMAN, 0, -1);
+ g_vars->scene18_swingers[g_vars->scene18_manWheelPosTo]->ani->_priority = 20;
- g_vars->scene18_var28 = 0;
+ g_vars->scene18_manIsReady = false;
g_vars->scene18_enteredTrubaRight = true;
- g_fp->_aniMan2 = g_vars->scene18_swingers[g_vars->scene18_var27]->ani;
+ g_fp->_aniMan2 = g_vars->scene18_swingers[g_vars->scene18_manWheelPosTo]->ani;
}
-void sceneHandler18_showManJumpTo() {
+void sceneHandler18and19_showManJump() {
int x, y;
- if (g_vars->scene18_swingers[g_vars->scene18_var31]->ani->_movement) {
- x = g_vars->scene18_swingers[g_vars->scene18_var31]->ani->_movement->_ox;
- y = g_vars->scene18_swingers[g_vars->scene18_var31]->ani->_movement->_oy;
+ if (g_vars->scene18_swingers[g_vars->scene18_manWheelPos]->ani->_movement) {
+ x = g_vars->scene18_swingers[g_vars->scene18_manWheelPos]->ani->_movement->_ox;
+ y = g_vars->scene18_swingers[g_vars->scene18_manWheelPos]->ani->_movement->_oy;
} else {
- x = g_vars->scene18_swingers[g_vars->scene18_var31]->ani->_ox;
- y = g_vars->scene18_swingers[g_vars->scene18_var31]->ani->_oy;
+ x = g_vars->scene18_swingers[g_vars->scene18_manWheelPos]->ani->_ox;
+ y = g_vars->scene18_swingers[g_vars->scene18_manWheelPos]->ani->_oy;
}
g_fp->_aniMan->show1(x + 62, y + 5, MV_MAN18_JUMPTOTRUBA, 0);
@@ -442,27 +442,27 @@ void sceneHandler18_showManJumpTo() {
mq->chain(0);
}
- g_vars->scene18_swingers[g_vars->scene18_var31]->sflags = 1;
+ g_vars->scene18_swingers[g_vars->scene18_manWheelPos]->sflags = 1;
- g_vars->scene18_swingers[g_vars->scene18_var31]->ani->changeStatics2(ST_KSL_NORM);
- g_vars->scene18_swingers[g_vars->scene18_var31]->ani->_priority = 30;
+ g_vars->scene18_swingers[g_vars->scene18_manWheelPos]->ani->changeStatics2(ST_KSL_NORM);
+ g_vars->scene18_swingers[g_vars->scene18_manWheelPos]->ani->_priority = 30;
}
void sceneHandler18and19_showGirlJumpTo() {
g_vars->scene18_girl->stopAnim_maybe();
g_vars->scene18_girl->hide();
- g_vars->scene18_swingers[g_vars->scene18_var33]->sflags = 4;
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->sflags = 4;
- g_vars->scene18_swingers[g_vars->scene18_var33]->ani->changeStatics2(ST_KSL_JUMPGIRL);
- g_vars->scene18_swingers[g_vars->scene18_var33]->ani->startAnim(MV_KSL_INGIRL, 0, -1);
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->ani->changeStatics2(ST_KSL_JUMPGIRL);
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->ani->startAnim(MV_KSL_INGIRL, 0, -1);
g_vars->scene18_var23--;
g_vars->scene18_var25--;
}
void sceneHandler18and19_showGirlJump() {
- StaticANIObject *ani = g_vars->scene18_swingers[g_vars->scene18_var32]->ani;
+ StaticANIObject *ani = g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani;
int x, y;
if (ani->_movement) {
@@ -477,10 +477,10 @@ void sceneHandler18and19_showGirlJump() {
g_vars->scene18_girl->_priority = 50;
g_vars->scene18_girl->startAnim(MV_GRL18_JUMPFROM, 0, -1);
- g_vars->scene18_swingers[g_vars->scene18_var32]->sflags = 1;
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->sflags = 1;
- g_vars->scene18_swingers[g_vars->scene18_var32]->ani->changeStatics2(ST_KSL_REACT);
- g_vars->scene18_swingers[g_vars->scene18_var32]->ani->startAnim(MV_KSL_CALMDOWN, 0, -1);
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani->changeStatics2(ST_KSL_REACT);
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani->startAnim(MV_KSL_CALMDOWN, 0, -1);
g_vars->scene18_var23 = 1;
g_vars->scene18_var25++;
@@ -490,16 +490,16 @@ void sceneHandler18and19_showBoyJumpTo() {
g_vars->scene18_boy->stopAnim_maybe();
g_vars->scene18_boy->hide();
- g_vars->scene18_swingers[g_vars->scene18_var33]->sflags = 2;
- g_vars->scene18_swingers[g_vars->scene18_var33]->ani->changeStatics2(ST_KSL_JUMPBOY);
- g_vars->scene18_swingers[g_vars->scene18_var33]->ani->startAnim(MV_KSL_INBOY, 0, -1);
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->sflags = 2;
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->ani->changeStatics2(ST_KSL_JUMPBOY);
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->ani->startAnim(MV_KSL_INBOY, 0, -1);
g_vars->scene18_var23--;
g_vars->scene18_var24--;
}
void sceneHandler18and19_showBoyJump() {
- StaticANIObject *ani = g_vars->scene18_swingers[g_vars->scene18_var32]->ani;
+ StaticANIObject *ani = g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani;
int x, y;
if (ani->_movement) {
@@ -514,10 +514,10 @@ void sceneHandler18and19_showBoyJump() {
g_vars->scene18_boy->_priority = 50;
g_vars->scene18_boy->startAnim(MV_BOY18_JUMPFROM, 0, -1);
- g_vars->scene18_swingers[g_vars->scene18_var32]->sflags = 1;
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->sflags = 1;
- g_vars->scene18_swingers[g_vars->scene18_var32]->ani->changeStatics2(ST_KSL_REACT);
- g_vars->scene18_swingers[g_vars->scene18_var32]->ani->startAnim(MV_KSL_CALMDOWN, 0, -1);
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani->changeStatics2(ST_KSL_REACT);
+ g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani->startAnim(MV_KSL_CALMDOWN, 0, -1);
g_vars->scene18_var26 = true;
}
@@ -603,19 +603,19 @@ void sceneHandler18and19_drawRiders() {
swinger->sflags = 8;
swinger->ani->changeStatics2(ST_KSL_BOY);
swinger->ani->startAnim(MV_KSL_JUMPBOY, 0, -1);
- g_vars->scene18_var32 = i;
+ g_vars->scene18_kidWheelPos = i;
} else if ((swinger->sflags & 4) && swinger->angle >= ANGLE(162) && oldangle < ANGLE(162)) {
swinger->sflags = 16;
swinger->ani->changeStatics2(ST_KSL_GIRL);
swinger->ani->startAnim(MV_KSL_JUMPGIRL, 0, -1);
- g_vars->scene18_var32 = i;
+ g_vars->scene18_kidWheelPos = i;
} else if (g_vars->scene18_var23) {
if (g_vars->scene18_var24 > 0 && (swinger->sflags & 1) && swinger->angle >= ANGLE(185) && oldangle < ANGLE(185)) {
- g_vars->scene18_var33 = i;
+ g_vars->scene18_kidWheelPosTo = i;
sceneHandler18and19_boyJumpTo();
}
} else if (g_vars->scene18_var25 > 0 && (swinger->sflags & 1) && swinger->angle >= ANGLE(187) && oldangle < ANGLE(187)) {
- g_vars->scene18_var33 = i;
+ g_vars->scene18_kidWheelPosTo = i;
sceneHandler18and19_girlJumpTo();
}
@@ -627,15 +627,15 @@ void sceneHandler18and19_drawRiders() {
}
}
- if (g_vars->scene18_var28 && (swinger->sflags & 1) && swinger->angle >= ANGLE(83) && oldangle < ANGLE(83)) {
- g_vars->scene18_var27 = i;
+ if (g_vars->scene18_manIsReady && (swinger->sflags & 1) && swinger->angle >= ANGLE(83) && oldangle < ANGLE(83)) {
+ g_vars->scene18_manWheelPosTo = i;
sceneHandler18and19_manStandArmchair();
}
if (!g_vars->scene18_enteredTrubaRight)
continue;
- if ((int)i == g_vars->scene18_var27) {
+ if ((int)i == g_vars->scene18_manWheelPosTo) {
if (swinger->angle >= ANGLE(170) && oldangle < ANGLE(170)) {
g_fp->_gameLoader->preloadScene(SC_18, TrubaRight);
} else if (swinger->angle >= ANGLE(25) && oldangle < ANGLE(25)) {
@@ -654,7 +654,7 @@ void sceneHandler18and19_drawRiders() {
swinger->ani->startAnim(MV_KSL_JUMPMAN, 0, -1);
swinger->ani->_priority = 35;
- g_vars->scene18_var31 = i;
+ g_vars->scene18_manWheelPos = i;
}
}
}
@@ -702,7 +702,7 @@ int sceneHandler18(ExCommand *cmd) {
break;
case MSG_SC18_MANREADY:
- g_vars->scene18_var28 = 1;
+ g_vars->scene18_manIsReady = true;
break;
case MSG_SC18_SHOWMANJUMPTO:
@@ -752,7 +752,7 @@ int sceneHandler18(ExCommand *cmd) {
|| (cmd->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0)) {
g_fp->processArcade(cmd);
- g_vars->scene18_var28 = 0;
+ g_vars->scene18_manIsReady = false;
break;
}
@@ -774,8 +774,8 @@ int sceneHandler18(ExCommand *cmd) {
g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right;
}
- if (g_vars->scene18_var28 && g_fp->_aniMan->_movement)
- g_vars->scene18_var28 = 0;
+ if (g_vars->scene18_manIsReady && g_fp->_aniMan->_movement)
+ g_vars->scene18_manIsReady = false;
if (g_vars->scene18_bridgeIsConvoluted) {
if (!g_vars->scene18_var12)
Commit: 548dd029ee5c7da40d53c6f2a9979940745e2dc7
https://github.com/scummvm/scummvm/commit/548dd029ee5c7da40d53c6f2a9979940745e2dc7
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-16T22:40:26+02:00
Commit Message:
FULLPIPE: Last renames in scene18and19. This completes the scene
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene18and19.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index d741047..147961b 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -279,14 +279,14 @@ Vars::Vars() {
scene18_girlIsSwinging = false;
scene18_rotationCounter = 0;
scene18_manY = 0;
- scene18_var12 = false;
+ scene18_wheelFlipper = false;
scene18_wheelIsTurning = true;
- scene18_var23 = -1;
- scene18_var24 = 0;
- scene18_var25 = 0;
- scene18_var26 = true;
+ scene18_kidIsOnWheel = -1;
+ scene18_boyIsOnWheel = 0;
+ scene18_girlIsOnWheel = 0;
+ scene18_boyJumpedOff = true;
scene18_jumpDistance = -1;
- scene18_var14 = -1;
+ scene18_jumpAngle = -1;
scene18_manIsReady = false;
scene18_enteredTrubaRight = false;
scene18_manWheelPos = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index ce08f17..f99e76d 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -483,18 +483,18 @@ public:
bool scene18_girlIsSwinging;
int scene18_rotationCounter;
int scene18_manY;
- bool scene18_var12;
+ bool scene18_wheelFlipper;
bool scene18_wheelIsTurning;
- int scene18_var23;
- int scene18_var24;
- int scene18_var25;
- bool scene18_var26;
+ int scene18_kidIsOnWheel;
+ int scene18_boyIsOnWheel;
+ int scene18_girlIsOnWheel;
+ bool scene18_boyJumpedOff;
int scene18_manWheelPos;
int scene18_manWheelPosTo;
int scene18_kidWheelPos;
int scene18_kidWheelPosTo;
int scene18_jumpDistance;
- int scene18_var14;
+ int scene18_jumpAngle;
bool scene18_manIsReady;
bool scene18_enteredTrubaRight;
StaticANIObject *scene18_boy;
diff --git a/engines/fullpipe/scenes/scene18and19.cpp b/engines/fullpipe/scenes/scene18and19.cpp
index e9911e7..ef3a404 100644
--- a/engines/fullpipe/scenes/scene18and19.cpp
+++ b/engines/fullpipe/scenes/scene18and19.cpp
@@ -286,9 +286,9 @@ void scene18_initScene1(Scene *sc) {
g_vars->scene18_girl->setOXY(newx + x, newy + y);
- g_vars->scene18_var12 = false;
+ g_vars->scene18_wheelFlipper = false;
g_vars->scene18_jumpDistance = -1;
- g_vars->scene18_var14 = -1;
+ g_vars->scene18_jumpAngle = -1;
if (g_vars->scene18_enteredTrubaRight) {
if (sc->_sceneId == SC_19)
@@ -322,15 +322,15 @@ void scene18_initScene2(Scene *sc) {
scene18_setupSwingers(armchair, sc);
g_vars->scene18_rotationCounter = 0;
- g_vars->scene18_var12 = false;
+ g_vars->scene18_wheelFlipper = false;
g_vars->scene18_wheelIsTurning = true;
- g_vars->scene18_var23 = -1;
- g_vars->scene18_var24 = 0;
- g_vars->scene18_var25 = 0;
- g_vars->scene18_var26 = true;
+ g_vars->scene18_kidIsOnWheel = -1;
+ g_vars->scene18_boyIsOnWheel = 0;
+ g_vars->scene18_girlIsOnWheel = 0;
+ g_vars->scene18_boyJumpedOff = true;
g_vars->scene18_manWheelPosTo = -1;
g_vars->scene18_jumpDistance = -1;
- g_vars->scene18_var14 = -1;
+ g_vars->scene18_jumpAngle = -1;
g_vars->scene18_manIsReady = false;
g_vars->scene18_enteredTrubaRight = 0;
g_vars->scene18_boy = sc->getStaticANIObject1ById(ANI_BOY18, -1);
@@ -457,8 +457,8 @@ void sceneHandler18and19_showGirlJumpTo() {
g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->ani->changeStatics2(ST_KSL_JUMPGIRL);
g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->ani->startAnim(MV_KSL_INGIRL, 0, -1);
- g_vars->scene18_var23--;
- g_vars->scene18_var25--;
+ g_vars->scene18_kidIsOnWheel--;
+ g_vars->scene18_girlIsOnWheel--;
}
void sceneHandler18and19_showGirlJump() {
@@ -482,8 +482,8 @@ void sceneHandler18and19_showGirlJump() {
g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani->changeStatics2(ST_KSL_REACT);
g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani->startAnim(MV_KSL_CALMDOWN, 0, -1);
- g_vars->scene18_var23 = 1;
- g_vars->scene18_var25++;
+ g_vars->scene18_kidIsOnWheel = 1;
+ g_vars->scene18_girlIsOnWheel++;
}
void sceneHandler18and19_showBoyJumpTo() {
@@ -494,8 +494,8 @@ void sceneHandler18and19_showBoyJumpTo() {
g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->ani->changeStatics2(ST_KSL_JUMPBOY);
g_vars->scene18_swingers[g_vars->scene18_kidWheelPosTo]->ani->startAnim(MV_KSL_INBOY, 0, -1);
- g_vars->scene18_var23--;
- g_vars->scene18_var24--;
+ g_vars->scene18_kidIsOnWheel--;
+ g_vars->scene18_boyIsOnWheel--;
}
void sceneHandler18and19_showBoyJump() {
@@ -519,7 +519,7 @@ void sceneHandler18and19_showBoyJump() {
g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani->changeStatics2(ST_KSL_REACT);
g_vars->scene18_swingers[g_vars->scene18_kidWheelPos]->ani->startAnim(MV_KSL_CALMDOWN, 0, -1);
- g_vars->scene18_var26 = true;
+ g_vars->scene18_boyJumpedOff = true;
}
void sceneHandler18and19_boyJumpTo() {
@@ -609,21 +609,21 @@ void sceneHandler18and19_drawRiders() {
swinger->ani->changeStatics2(ST_KSL_GIRL);
swinger->ani->startAnim(MV_KSL_JUMPGIRL, 0, -1);
g_vars->scene18_kidWheelPos = i;
- } else if (g_vars->scene18_var23) {
- if (g_vars->scene18_var24 > 0 && (swinger->sflags & 1) && swinger->angle >= ANGLE(185) && oldangle < ANGLE(185)) {
+ } else if (g_vars->scene18_kidIsOnWheel) {
+ if (g_vars->scene18_boyIsOnWheel > 0 && (swinger->sflags & 1) && swinger->angle >= ANGLE(185) && oldangle < ANGLE(185)) {
g_vars->scene18_kidWheelPosTo = i;
sceneHandler18and19_boyJumpTo();
}
- } else if (g_vars->scene18_var25 > 0 && (swinger->sflags & 1) && swinger->angle >= ANGLE(187) && oldangle < ANGLE(187)) {
+ } else if (g_vars->scene18_girlIsOnWheel > 0 && (swinger->sflags & 1) && swinger->angle >= ANGLE(187) && oldangle < ANGLE(187)) {
g_vars->scene18_kidWheelPosTo = i;
sceneHandler18and19_girlJumpTo();
}
if (swinger->angle >= ANGLE(200) && oldangle < ANGLE(200)) {
- if (g_vars->scene18_var26)
- g_vars->scene18_var24++;
+ if (g_vars->scene18_boyJumpedOff)
+ g_vars->scene18_boyIsOnWheel++;
- g_vars->scene18_var26 = false;
+ g_vars->scene18_boyJumpedOff = false;
}
}
@@ -647,7 +647,7 @@ void sceneHandler18and19_drawRiders() {
if (g_vars->scene18_jumpDistance > 0) {
if (swinger->sflags & 0x20) {
- double newa = (double)g_vars->scene18_var14 * ANGLE(1);
+ double newa = (double)g_vars->scene18_jumpAngle * ANGLE(1);
if (newa <= swinger->angle && oldangle < newa) {
swinger->ani->changeStatics2(ST_KSL_MAN);
@@ -778,10 +778,10 @@ int sceneHandler18(ExCommand *cmd) {
g_vars->scene18_manIsReady = false;
if (g_vars->scene18_bridgeIsConvoluted) {
- if (!g_vars->scene18_var12)
+ if (!g_vars->scene18_wheelFlipper)
sceneHandler18and19_drawRiders();
- g_vars->scene18_var12 = !g_vars->scene18_var12;
+ g_vars->scene18_wheelFlipper = !g_vars->scene18_wheelFlipper;
if (!g_vars->scene18_whirlgig->_movement) {
g_vars->scene18_whirlgig->startAnim(MV_WHR18_SPIN, 0, -1);
@@ -805,8 +805,8 @@ void sceneHandler19_updateNumRides() {
if (numRides > 1) {
g_fp->setObjectState(sO_Girl, g_fp->getObjectEnumState(sO_Girl, sO_IsSwinging));
- g_vars->scene18_var23 = 1;
- g_vars->scene18_var25++;
+ g_vars->scene18_kidIsOnWheel = 1;
+ g_vars->scene18_girlIsOnWheel++;
numRides = 0;
}
@@ -848,25 +848,25 @@ int sceneHandler19(ExCommand *cmd) {
switch (g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY)) {
case PIC_SC19_RTRUBA1:
g_vars->scene18_jumpDistance = 1;
- g_vars->scene18_var14 = 331;
+ g_vars->scene18_jumpAngle = 331;
cmd->_messageKind = 0;
break;
case PIC_SC19_RTRUBA2:
g_vars->scene18_jumpDistance = 2;
- g_vars->scene18_var14 = 350;
+ g_vars->scene18_jumpAngle = 350;
cmd->_messageKind = 0;
break;
case PIC_SC19_RTRUBA3:
g_vars->scene18_jumpDistance = 3;
- g_vars->scene18_var14 = 9;
+ g_vars->scene18_jumpAngle = 9;
cmd->_messageKind = 0;
break;
default:
g_vars->scene18_jumpDistance = -1;
- g_vars->scene18_var14 = -1;
+ g_vars->scene18_jumpAngle = -1;
cmd->_messageKind = 0;
break;
}
@@ -901,10 +901,10 @@ int sceneHandler19(ExCommand *cmd) {
}
if (g_vars->scene18_bridgeIsConvoluted) {
- if (!g_vars->scene18_var12)
+ if (!g_vars->scene18_wheelFlipper)
sceneHandler18and19_drawRiders();
- g_vars->scene18_var12 = !g_vars->scene18_var12;
+ g_vars->scene18_wheelFlipper = !g_vars->scene18_wheelFlipper;
if (!g_vars->scene18_whirlgig->_movement) {
g_vars->scene18_whirlgig->startAnim(MV_WHR19_SPIN, 0, -1);
More information about the Scummvm-git-logs
mailing list