[Scummvm-cvs-logs] scummvm master -> ce91844f794e4daa74640909fc38cfc087f64e2d
sev-
sev at scummvm.org
Wed Jan 1 15:38:23 CET 2014
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
08f3a67840 FULLPIPE: Rename vars in scene16
ce91844f79 FULLPIPE: Rename remaining vars in scene16. This completes the scene
Commit: 08f3a67840de9bc03ca4e727fb10d7592b62b761
https://github.com/scummvm/scummvm/commit/08f3a67840de9bc03ca4e727fb10d7592b62b761
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-01T06:32:47-08:00
Commit Message:
FULLPIPE: Rename vars in scene16
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene16.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 5c01ba5..cb6e427 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -227,13 +227,9 @@ Vars::Vars() {
scene15_ladder = 0;
scene15_boot = 0;
- scene16_var01 = 0;
- scene16_var02 = 0;
- scene16_var03 = 0;
- scene16_var04 = 0;
- scene16_var05.clear();
- scene16_var06 = 0;
- scene16_var07 = 0;
+ scene16_figures.clear();
+ scene16_walkingBoy = 0;
+ scene16_walkingGirl = 0;
scene16_var08 = 0;
scene16_wire = 0;
scene16_mug = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index b28bd9a..0641491 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -308,13 +308,9 @@ public:
PictureObject *scene15_ladder;
StaticANIObject *scene15_boot;
- int scene16_var01;
- int scene16_var02;
- int scene16_var03;
- int scene16_var04;
- Common::List<StaticANIObject *> scene16_var05;
- StaticANIObject *scene16_var06;
- StaticANIObject *scene16_var07;
+ Common::List<StaticANIObject *> scene16_figures;
+ StaticANIObject *scene16_walkingBoy;
+ StaticANIObject *scene16_walkingGirl;
int scene16_var08;
StaticANIObject *scene16_wire;
StaticANIObject *scene16_mug;
diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index 1ba4920..2c18889 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -37,13 +37,9 @@
namespace Fullpipe {
void scene16_initScene(Scene *sc) {
- g_vars->scene16_var01 = 200;
- g_vars->scene16_var02 = 200;
- g_vars->scene16_var03 = 300;
- g_vars->scene16_var04 = 300;
- g_vars->scene16_var05.clear();
- g_vars->scene16_var06 = 0;
- g_vars->scene16_var07 = 0;
+ g_vars->scene16_figures.clear();
+ g_vars->scene16_walkingBoy = 0;
+ g_vars->scene16_walkingGirl = 0;
g_vars->scene16_var08 = 200;
g_vars->scene16_wire = sc->getStaticANIObject1ById(ANI_WIRE16, -1);
g_vars->scene16_mug = sc->getStaticANIObject1ById(ANI_MUG, -1);
@@ -65,7 +61,7 @@ void scene16_initScene(Scene *sc) {
int idx = 0;
for (int i = 0; i < 3; i++) {
- g_vars->scene16_var05.push_back(boy[idx]);
+ g_vars->scene16_figures.push_back(boy[idx]);
idx++;
@@ -73,10 +69,10 @@ void scene16_initScene(Scene *sc) {
idx = 0;
}
- g_vars->scene16_var05.push_back(sc->getStaticANIObject1ById(ANI_GIRL, -1));
+ g_vars->scene16_figures.push_back(sc->getStaticANIObject1ById(ANI_GIRL, -1));
for (int i = 0; i < 4; i++) {
- g_vars->scene16_var05.push_back(boy[idx]);
+ g_vars->scene16_figures.push_back(boy[idx]);
idx++;
@@ -182,20 +178,20 @@ void sceneHandler16_fillMug() {
g_vars->scene16_jettie->_priority = 15;
g_vars->scene16_jettie->startAnim(MV_JTI_FLOWBY, 0, -1);
- if (g_vars->scene16_var06) {
+ if (g_vars->scene16_walkingBoy) {
mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYOUT), 0, 1);
- mq->replaceKeyCode(-1, g_vars->scene16_var06->_okeyCode);
- if (mq->chain(g_vars->scene16_var06) || !mq)
+ mq->replaceKeyCode(-1, g_vars->scene16_walkingBoy->_okeyCode);
+ if (mq->chain(g_vars->scene16_walkingBoy) || !mq)
return;
} else {
- if (!g_vars->scene16_var07)
+ if (!g_vars->scene16_walkingGirl)
return;
mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1);
- mq->replaceKeyCode(-1, g_vars->scene16_var07->_okeyCode);
- if (mq->chain(g_vars->scene16_var07) || !mq)
+ mq->replaceKeyCode(-1, g_vars->scene16_walkingGirl->_okeyCode);
+ if (mq->chain(g_vars->scene16_walkingGirl) || !mq)
return;
}
delete mq;
@@ -209,20 +205,20 @@ void sceneHandler16_fillMug() {
StaticANIObject *ani;
- if (g_vars->scene16_var06) {
+ if (g_vars->scene16_walkingBoy) {
mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYOUT), 0, 1);
- mq->replaceKeyCode(-1, g_vars->scene16_var06->_okeyCode);
+ mq->replaceKeyCode(-1, g_vars->scene16_walkingBoy->_okeyCode);
- ani = g_vars->scene16_var06;
+ ani = g_vars->scene16_walkingBoy;
} else {
- if (!g_vars->scene16_var07)
+ if (!g_vars->scene16_walkingGirl)
return;
mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GIRLOUT), 0, 1);
- mq->replaceKeyCode(-1, g_vars->scene16_var07->_okeyCode);
- ani = g_vars->scene16_var07;
+ mq->replaceKeyCode(-1, g_vars->scene16_walkingGirl->_okeyCode);
+ ani = g_vars->scene16_walkingGirl;
}
if (!mq->chain(ani))
@@ -248,21 +244,21 @@ void sceneHandler16_startLaugh() {
void sceneHandler16_drink() {
if (g_vars->scene16_mug->_flags & 4) {
if (!g_vars->scene16_jettie->_movement) {
- if (!g_vars->scene16_var06 || !g_vars->scene16_var06->_movement || g_vars->scene16_var06->_movement->_id != MV_BOY_DRINK) {
- if (!g_vars->scene16_var07 || !g_vars->scene16_var07->_movement || g_vars->scene16_var07->_movement->_id != MV_GRL_DRINK) {
+ if (!g_vars->scene16_walkingBoy || !g_vars->scene16_walkingBoy->_movement || g_vars->scene16_walkingBoy->_movement->_id != MV_BOY_DRINK) {
+ if (!g_vars->scene16_walkingGirl || !g_vars->scene16_walkingGirl->_movement || g_vars->scene16_walkingGirl->_movement->_id != MV_GRL_DRINK) {
if (g_vars->scene16_mug->_statics->_staticsId == ST_MUG_FULL) {
MessageQueue *mq;
ExCommand *ex;
- if (g_vars->scene16_var06) {
+ if (g_vars->scene16_walkingBoy) {
g_fp->_aniMan->_flags |= 0x180;
- g_vars->scene16_var06->changeStatics2(ST_BOY_STAND);
- g_vars->scene16_var06->queueMessageQueue(0);
+ g_vars->scene16_walkingBoy->changeStatics2(ST_BOY_STAND);
+ g_vars->scene16_walkingBoy->queueMessageQueue(0);
mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_BOYKICK), 0, 1);
- mq->replaceKeyCode(-1, g_vars->scene16_var06->_okeyCode);
+ mq->replaceKeyCode(-1, g_vars->scene16_walkingBoy->_okeyCode);
ex = new ExCommand(ANI_MAN, 34, 384, 0, 0, 0, 1, 0, 0, 0);
ex->_excFlags |= 3u;
@@ -347,17 +343,17 @@ void sceneHandler16_showWire() {
}
void sceneHandler16_putOnWheel() {
- StaticANIObject *ani = g_vars->scene16_var06;
+ StaticANIObject *ani = g_vars->scene16_walkingBoy;
if (!ani)
- ani = g_vars->scene16_var07;
+ ani = g_vars->scene16_walkingGirl;
if (ani)
- g_vars->scene16_var05.push_back(ani);
+ g_vars->scene16_figures.push_back(ani);
- ani = g_vars->scene16_var05.front();
+ ani = g_vars->scene16_figures.front();
- g_vars->scene16_var05.pop_front();
+ g_vars->scene16_figures.pop_front();
if (ani) {
MessageQueue *mq;
@@ -368,8 +364,8 @@ void sceneHandler16_putOnWheel() {
mq->replaceKeyCode(-1, ani->_okeyCode);
mq->chain(0);
- g_vars->scene16_var06 = ani;
- g_vars->scene16_var07 = 0;
+ g_vars->scene16_walkingBoy = ani;
+ g_vars->scene16_walkingGirl = 0;
} else if (ani->_id == ANI_GIRL) {
if (g_fp->getObjectState(sO_Girl) == g_fp->getObjectEnumState(sO_Girl, sO_IsSwinging)) {
mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC16_GOGIRL), 0, 1);
@@ -377,8 +373,8 @@ void sceneHandler16_putOnWheel() {
mq->replaceKeyCode(-1, ani->_okeyCode);
mq->chain(0);
- g_vars->scene16_var06 = 0;
- g_vars->scene16_var07 = ani;
+ g_vars->scene16_walkingBoy = 0;
+ g_vars->scene16_walkingGirl = ani;
}
}
}
@@ -457,14 +453,14 @@ int sceneHandler16(ExCommand *cmd) {
g_vars->scene16_var11 = x;
g_vars->scene16_var12 = g_fp->_aniMan2->_oy;
- if (x < g_fp->_sceneRect.left + g_vars->scene16_var01) {
- g_fp->_currentScene->_x = x - g_vars->scene16_var03 - g_fp->_sceneRect.left;
+ if (x < g_fp->_sceneRect.left + 200) {
+ g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
x = g_vars->scene16_var11;
}
- if (x > g_fp->_sceneRect.right - g_vars->scene16_var01)
- g_fp->_currentScene->_x = x + g_vars->scene16_var03 - g_fp->_sceneRect.right;
+ if (x > g_fp->_sceneRect.right - 200)
+ g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right;
}
if (g_vars->scene16_var10) {
Commit: ce91844f794e4daa74640909fc38cfc087f64e2d
https://github.com/scummvm/scummvm/commit/ce91844f794e4daa74640909fc38cfc087f64e2d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-01-01T06:37:37-08:00
Commit Message:
FULLPIPE: Rename remaining vars in scene16. This completes the scene
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene16.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index cb6e427..e5e5f94 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -230,16 +230,14 @@ Vars::Vars() {
scene16_figures.clear();
scene16_walkingBoy = 0;
scene16_walkingGirl = 0;
- scene16_var08 = 0;
+ scene16_walkingCount = 0;
scene16_wire = 0;
scene16_mug = 0;
scene16_jettie = 0;
scene16_boot = 0;
- scene16_var09 = 0;
+ scene16_girlIsLaughing = false;
scene16_sound = 0;
- scene16_var10 = 0;
- scene16_var11 = 0;
- scene16_var12 = 0;
+ scene16_placeIsOccupied = false;
scene24_jetIsOn = false;
scene24_flowIsLow = false;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 0641491..4ad961b 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -311,16 +311,14 @@ public:
Common::List<StaticANIObject *> scene16_figures;
StaticANIObject *scene16_walkingBoy;
StaticANIObject *scene16_walkingGirl;
- int scene16_var08;
+ int scene16_walkingCount;
StaticANIObject *scene16_wire;
StaticANIObject *scene16_mug;
StaticANIObject *scene16_jettie;
StaticANIObject *scene16_boot;
- int scene16_var09;
+ bool scene16_girlIsLaughing;
int scene16_sound;
- int scene16_var10;
- int scene16_var11;
- int scene16_var12;
+ bool scene16_placeIsOccupied;
bool scene24_jetIsOn;
bool scene24_flowIsLow;
diff --git a/engines/fullpipe/scenes/scene16.cpp b/engines/fullpipe/scenes/scene16.cpp
index 2c18889..a280273 100644
--- a/engines/fullpipe/scenes/scene16.cpp
+++ b/engines/fullpipe/scenes/scene16.cpp
@@ -40,16 +40,16 @@ void scene16_initScene(Scene *sc) {
g_vars->scene16_figures.clear();
g_vars->scene16_walkingBoy = 0;
g_vars->scene16_walkingGirl = 0;
- g_vars->scene16_var08 = 200;
+ g_vars->scene16_walkingCount = 200;
g_vars->scene16_wire = sc->getStaticANIObject1ById(ANI_WIRE16, -1);
g_vars->scene16_mug = sc->getStaticANIObject1ById(ANI_MUG, -1);
g_vars->scene16_jettie = sc->getStaticANIObject1ById(ANI_JETTIE, -1);
g_vars->scene16_boot = sc->getStaticANIObject1ById(ANI_BOOT_16, -1);
- g_vars->scene16_var09 = 0;
+ g_vars->scene16_girlIsLaughing = false;
g_vars->scene16_sound = SND_16_034;
if (g_fp->getObjectState(sO_Bridge) == g_fp->getObjectEnumState(sO_Bridge, sO_Convoluted)) {
- g_vars->scene16_var10 = 1;
+ g_vars->scene16_placeIsOccupied = true;
StaticANIObject *boy[2];
boy[0] = sc->getStaticANIObject1ById(ANI_BOY, -1);
@@ -82,7 +82,7 @@ void scene16_initScene(Scene *sc) {
} else {
g_fp->setObjectState(sO_Girl, g_fp->getObjectEnumState(sO_Girl, sO_IsSwinging));
- g_vars->scene16_var10 = 0;
+ g_vars->scene16_placeIsOccupied = false;
StaticANIObject *ani = new StaticANIObject(g_fp->accessScene(SC_COMMON)->getStaticANIObject1ById(ANI_BEARDED_CMN, -1));
ani->_movement = 0;
@@ -238,7 +238,7 @@ void sceneHandler16_startLaugh() {
g_fp->getGameLoaderGameVar()->getSubVarByName("OBJSTATES")->setSubVarAsInt(sO_DudeSwinged, 0);
- g_vars->scene16_var09 = 1;
+ g_vars->scene16_girlIsLaughing = true;
}
void sceneHandler16_drink() {
@@ -386,7 +386,7 @@ void sceneHandler16_girlROTFL() {
girl->changeStatics2(ST_GRL_LAUGH);
girl->startAnim(MV_GRL_FALL, 0, -1);
- g_vars->scene16_var09 = 0;
+ g_vars->scene16_girlIsLaughing = false;
}
int sceneHandler16(ExCommand *cmd) {
@@ -450,30 +450,24 @@ int sceneHandler16(ExCommand *cmd) {
if (g_fp->_aniMan2) {
int x = g_fp->_aniMan2->_ox;
- g_vars->scene16_var11 = x;
- g_vars->scene16_var12 = g_fp->_aniMan2->_oy;
-
- if (x < g_fp->_sceneRect.left + 200) {
+ if (x < g_fp->_sceneRect.left + 200)
g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
- x = g_vars->scene16_var11;
- }
-
if (x > g_fp->_sceneRect.right - 200)
g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right;
}
- if (g_vars->scene16_var10) {
- g_vars->scene16_var08++;
+ if (g_vars->scene16_placeIsOccupied) {
+ g_vars->scene16_walkingCount++;
- if (g_vars->scene16_var08 < 280) {
+ if (g_vars->scene16_walkingCount < 280) {
sceneHandler16_putOnWheel();
- g_vars->scene16_var08 = 0;
+ g_vars->scene16_walkingCount = 0;
}
}
- if (g_vars->scene16_var09) {
+ if (g_vars->scene16_girlIsLaughing) {
if (g_fp->_aniMan->_movement)
if (g_fp->_aniMan->_movement->_id == MV_MAN_TURN_RL)
sceneHandler16_girlROTFL();
More information about the Scummvm-git-logs
mailing list