[Scummvm-cvs-logs] scummvm master -> 1970bf81e5591e95a9c5c5aa682afacc05327886
sev-
sev at scummvm.org
Mon Feb 10 22:31:09 CET 2014
This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f3629af0d5 FULLPIPE: Started renames in scene27
39e28d5cf7 FULLPIPE: Finish var renames in scene27
1970bf81e5 FULLPIPE: Finish renames in scene27. This completes the scene
Commit: f3629af0d5cae78d278ed285af469215a15751ee
https://github.com/scummvm/scummvm/commit/f3629af0d5cae78d278ed285af469215a15751ee
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-10T13:30:35-08:00
Commit Message:
FULLPIPE: Started renames in scene27
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene27.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index b60e2fc..fb0346b 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -301,18 +301,14 @@ Vars::Vars() {
scene26_sock = 0;
scene26_activeVent = 0;
- scene27_var01 = 0;
- scene27_var02 = 0;
- scene27_var03 = 0;
- scene27_var04 = 0;
scene27_hitZone = 0;
scene27_driver = 0;
scene27_maid = 0;
scene27_batHandler = 0;
scene27_var15 = 0;
scene27_bat = 0;
- scene27_var08 = 0;
- scene27_var09 = 0;
+ scene27_dudeIsAiming = false;
+ scene27_maxPhaseReached = false;
scene27_var10 = 0;
scene27_var11 = 0;
scene27_var12 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 0228d1f..69e3f5c 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -488,18 +488,14 @@ public:
StaticANIObject *scene26_sock;
StaticANIObject *scene26_activeVent;
- int scene27_var01;
- int scene27_var02;
- int scene27_var03;
- int scene27_var04;
PictureObject *scene27_hitZone;
StaticANIObject *scene27_driver;
StaticANIObject *scene27_maid;
StaticANIObject *scene27_batHandler;
int scene27_var15;
StaticANIObject *scene27_bat;
- int scene27_var08;
- int scene27_var09;
+ bool scene27_dudeIsAiming;
+ bool scene27_maxPhaseReached;
int scene27_var10;
int scene27_var11;
int scene27_var12;
diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp
index 2024faf..1101969 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/fullpipe/scenes/scene27.cpp
@@ -49,10 +49,6 @@ struct Bat {
};
void scene27_initScene(Scene *sc) {
- g_vars->scene27_var01 = 200;
- g_vars->scene27_var02 = 200;
- g_vars->scene27_var03 = 300;
- g_vars->scene27_var04 = 300;
g_vars->scene27_hitZone = sc->getPictureObjectById(PIC_SC27_HITZONE2, 0);
g_vars->scene27_driver = sc->getStaticANIObject1ById(ANI_VODILLA, -1);
g_vars->scene27_maid = sc->getStaticANIObject1ById(ANI_MAID, -1);
@@ -117,8 +113,8 @@ void scene27_initScene(Scene *sc) {
sc->addStaticANIObject(newbat, 1);
}
- g_vars->scene27_var08 = 0;
- g_vars->scene27_var09 = 0;
+ g_vars->scene27_dudeIsAiming = false;
+ g_vars->scene27_maxPhaseReached = false;
g_vars->scene27_var10 = 0;
g_vars->scene27_var11 = 0;
g_vars->scene27_var12 = 0;
@@ -144,12 +140,12 @@ void scene27_initScene(Scene *sc) {
int scene27_updateCursor() {
g_fp->updateCursorCommon();
- if (g_vars->scene27_var08) {
+ if (g_vars->scene27_dudeIsAiming) {
if (g_fp->_cursorId != PIC_CSR_DEFAULT_INV && g_fp->_cursorId != PIC_CSR_ITN_INV)
g_fp->_cursorId = PIC_CSR_ARCADE7_D;
} else if (g_fp->_objectIdAtCursor == ANI_MAN) {
- if (g_vars->scene27_var09)
+ if (g_vars->scene27_maxPhaseReached)
if (g_fp->_cursorId == PIC_CSR_DEFAULT)
g_fp->_cursorId = PIC_CSR_ITN;
}
@@ -171,7 +167,7 @@ void sceneHandler27_driverGiveVent() {
void sceneHandler27_winArcade() {
if (g_fp->getObjectState(sO_Driver) == g_fp->getObjectEnumState(sO_Driver, sO_WithSteering)) {
- g_vars->scene27_var08 = 0;
+ g_vars->scene27_dudeIsAiming = false;
g_fp->_aniMan->_callback2 = 0;
g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT);
@@ -214,9 +210,9 @@ int sceneHandler27_updateScreenCallback() {
}
void sceneHandler27_aniManCallback(int *phase) {
- if (!g_vars->scene27_var09) {
+ if (!g_vars->scene27_maxPhaseReached) {
if (*phase >= 5)
- g_vars->scene27_var09 = 1;
+ g_vars->scene27_maxPhaseReached = true;
else
++*phase;
}
@@ -235,7 +231,7 @@ void sceneHandler27_throwBat() {
g_fp->_behaviorManager->setFlagByStaticAniObject(g_fp->_aniMan, 0);
- g_vars->scene27_var09 = 0;
+ g_vars->scene27_maxPhaseReached = false;
g_vars->scene27_bat->hide();
}
@@ -292,8 +288,8 @@ void sceneHandler27_startBat(StaticANIObject *bat) {
}
void sceneHandler27_startAiming() {
- g_vars->scene27_var08 = 0;
- g_vars->scene27_var09 = 0;
+ g_vars->scene27_dudeIsAiming = false;
+ g_vars->scene27_maxPhaseReached = false;
g_fp->_aniMan->_callback2 = 0;
@@ -315,8 +311,8 @@ void sceneHandler27_startAiming() {
void sceneHandler27_sub04(ExCommand *cmd) {
g_vars->scene27_var16 = cmd->_x;
g_vars->scene27_var17 = cmd->_y;
- g_vars->scene27_var08 = 1;
- g_vars->scene27_var09 = 0;
+ g_vars->scene27_dudeIsAiming = true;
+ g_vars->scene27_maxPhaseReached = false;
}
void sceneHandler27_aimDude() {
@@ -715,14 +711,14 @@ int sceneHandler27(ExCommand *cmd) {
break;
case 30:
- if (g_vars->scene27_var08)
+ if (g_vars->scene27_dudeIsAiming)
sceneHandler27_startAiming();
break;
case 29:
if (g_fp->_aniMan == g_fp->_currentScene->getStaticANIObjectAtPos(g_fp->_sceneRect.left + cmd->_x, g_fp->_sceneRect.top + cmd->_y)
- && g_vars->scene27_var09)
+ && g_vars->scene27_maxPhaseReached)
sceneHandler27_sub04(cmd);
break;
@@ -731,14 +727,14 @@ int sceneHandler27(ExCommand *cmd) {
if (g_fp->_aniMan2) {
int x = g_fp->_aniMan2->_ox;
- if (x < g_fp->_sceneRect.left + g_vars->scene27_var01)
- g_fp->_currentScene->_x = x - g_vars->scene27_var03 - g_fp->_sceneRect.left;
+ if (x < g_fp->_sceneRect.left + 200)
+ g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
- if (x > g_fp->_sceneRect.right - g_vars->scene27_var01)
- g_fp->_currentScene->_x = x + g_vars->scene27_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->scene27_var08)
+ if (g_vars->scene27_dudeIsAiming)
sceneHandler27_aimDude();
if (g_vars->scene27_var10) {
Commit: 39e28d5cf7b4ce1ab8e58aa6a2984a5108cde3c4
https://github.com/scummvm/scummvm/commit/39e28d5cf7b4ce1ab8e58aa6a2984a5108cde3c4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-10T13:30:35-08:00
Commit Message:
FULLPIPE: Finish var renames in scene27
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene27.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index fb0346b..6225c33 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -305,16 +305,16 @@ Vars::Vars() {
scene27_driver = 0;
scene27_maid = 0;
scene27_batHandler = 0;
- scene27_var15 = 0;
+ scene27_driverHasVent = true;
scene27_bat = 0;
scene27_dudeIsAiming = false;
scene27_maxPhaseReached = false;
- scene27_var10 = 0;
- scene27_var11 = 0;
- scene27_var12 = 0;
- scene27_var13 = 0;
- scene27_var16 = 0;
- scene27_var17 = 0;
+ scene27_wipeIsNeeded = false;
+ scene27_driverPushedButton = false;
+ scene27_numLostBats = 0;
+ scene27_knockCount = 0;
+ scene27_aimStartX = 0;
+ scene27_aimStartY = 0;
scene27_launchPhase = 0;
scene28_fliesArePresent = true;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 69e3f5c..1719618 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -492,16 +492,16 @@ public:
StaticANIObject *scene27_driver;
StaticANIObject *scene27_maid;
StaticANIObject *scene27_batHandler;
- int scene27_var15;
+ bool scene27_driverHasVent;
StaticANIObject *scene27_bat;
bool scene27_dudeIsAiming;
bool scene27_maxPhaseReached;
- int scene27_var10;
- int scene27_var11;
- int scene27_var12;
- int scene27_var13;
- int scene27_var16;
- int scene27_var17;
+ bool scene27_wipeIsNeeded;
+ bool scene27_driverPushedButton;
+ int scene27_numLostBats;
+ int scene27_knockCount;
+ int scene27_aimStartX;
+ int scene27_aimStartY;
int scene27_launchPhase;
BallChain scene27_balls;
Common::Array<Bat *> scene27_bats;
diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp
index 1101969..2b928b8 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/fullpipe/scenes/scene27.cpp
@@ -66,7 +66,7 @@ void scene27_initScene(Scene *sc) {
g_vars->scene27_bats.clear();
g_vars->scene27_var07.clear();
- g_vars->scene27_var15 = 1;
+ g_vars->scene27_driverHasVent = true;
g_vars->scene27_bat = sc->getStaticANIObject1ById(ANI_BITA, -1);
for (int i = 0; i < 4; i++) {
@@ -115,10 +115,10 @@ void scene27_initScene(Scene *sc) {
g_vars->scene27_dudeIsAiming = false;
g_vars->scene27_maxPhaseReached = false;
- g_vars->scene27_var10 = 0;
- g_vars->scene27_var11 = 0;
- g_vars->scene27_var12 = 0;
- g_vars->scene27_var13 = 0;
+ g_vars->scene27_wipeIsNeeded = false;
+ g_vars->scene27_driverPushedButton = false;
+ g_vars->scene27_numLostBats = 0;
+ g_vars->scene27_knockCount = 0;
g_vars->scene27_launchPhase = 0;
Scene *oldsc = g_fp->_currentScene;
@@ -157,7 +157,7 @@ void sceneHandler27_driverGiveVent() {
g_vars->scene27_driver->changeStatics2(ST_DRV_VENT);
g_vars->scene27_driver->startMQIfIdle(QU_DRV_GIVEVENT, 1);
- g_vars->scene27_var15 = 0;
+ g_vars->scene27_driverHasVent = false;
getCurrSceneSc2MotionController()->setEnabled();
getGameLoaderInteractionController()->enableFlag24();
@@ -309,14 +309,14 @@ void sceneHandler27_startAiming() {
}
void sceneHandler27_sub04(ExCommand *cmd) {
- g_vars->scene27_var16 = cmd->_x;
- g_vars->scene27_var17 = cmd->_y;
+ g_vars->scene27_aimStartX = cmd->_x;
+ g_vars->scene27_aimStartY = cmd->_y;
g_vars->scene27_dudeIsAiming = true;
g_vars->scene27_maxPhaseReached = false;
}
void sceneHandler27_aimDude() {
- int phase = (g_vars->scene27_var16 - g_fp->_mouseScreenPos.x) / 20 + 6;
+ int phase = (g_vars->scene27_aimStartX - g_fp->_mouseScreenPos.x) / 20 + 6;
if (phase < 6)
phase = 6;
@@ -442,14 +442,14 @@ void sceneHandler27_driverPushButton() {
g_vars->scene27_driver->changeStatics2(ST_DRV_VENT);
chainQueue(QU_DRV_PUSHBUTTON, 1);
- g_vars->scene27_var11 = 1;
+ g_vars->scene27_driverPushedButton = true;
} else {
g_vars->scene27_driver->changeStatics2(ST_DRV_SITNOVENT);
chainQueue(QU_DRV_PUSHBUTTON_NOVENT, 1);
- g_vars->scene27_var11 = 1;
+ g_vars->scene27_driverPushedButton = true;
}
}
@@ -528,7 +528,7 @@ void sceneHandler27_batLogic() {
}
void sceneHandler27_calcWinArcade() {
- if (!g_vars->scene27_var10 && !g_vars->scene27_var11) {
+ if (!g_vars->scene27_wipeIsNeeded && !g_vars->scene27_driverPushedButton) {
int numHilite = 0;
for (uint i = 0; i < g_vars->scene27_bats.size(); i++) {
@@ -557,8 +557,8 @@ void sceneHandler27_calcWinArcade() {
sceneHandler27_maidSwitchback();
}
-void sceneHandler27_sub02() {
- g_vars->scene27_var10 = 0;
+void sceneHandler27_regenBats() {
+ g_vars->scene27_wipeIsNeeded = false;
for (uint i = 0; i < g_vars->scene27_var07.size(); i++) {
g_vars->scene27_var07[i]->ani->hide();
@@ -607,14 +607,14 @@ void sceneHandler27_sub02() {
sceneHandler27_batLogic();
- g_vars->scene27_var11 = 0;
+ g_vars->scene27_driverPushedButton = false;
}
void sceneHandler27_animateBats() {
- int oldCount = g_vars->scene27_var13;
+ int oldCount = g_vars->scene27_knockCount;
- g_vars->scene27_var12 = 0;
- g_vars->scene27_var13 = 0;
+ g_vars->scene27_numLostBats = 0;
+ g_vars->scene27_knockCount = 0;
for (uint i = 0; i < g_vars->scene27_bats.size(); i++) {
Bat *bat = g_vars->scene27_bats[i];
@@ -637,13 +637,13 @@ void sceneHandler27_animateBats() {
bat->powerSin = sin(bat->field_10) * bat->power;
if (bat->power >= 0.5)
- g_vars->scene27_var13++;
+ g_vars->scene27_knockCount++;
else
bat->power = 0;
sceneHandler27_batSetColors(i);
- if (!sceneHandler27_batFallLogic(i) && !g_vars->scene27_var10) {
+ if (!sceneHandler27_batFallLogic(i) && !g_vars->scene27_wipeIsNeeded) {
for (uint j = 0; j < g_vars->scene27_bats.size(); j++) {
if (i != j && sceneHandler27_batCalcDistance(i, j))
sceneHandler27_knockBats(i, j);
@@ -655,7 +655,7 @@ void sceneHandler27_animateBats() {
Bat *bat = g_vars->scene27_var07[i];
if (bat->currY >= 700.0) {
- g_vars->scene27_var12++;
+ g_vars->scene27_numLostBats++;
} else {
bat->currX = bat->powerCos + bat->currX;
bat->currY = bat->powerSin + bat->currY;
@@ -663,12 +663,13 @@ void sceneHandler27_animateBats() {
bat->powerSin = bat->powerSin + 1.0;
}
}
- if (oldCount != g_vars->scene27_var13 && !g_vars->scene27_var13)
+
+ if (oldCount != g_vars->scene27_knockCount && !g_vars->scene27_knockCount)
sceneHandler27_calcWinArcade();
- if (g_vars->scene27_var10) {
- if (g_vars->scene27_var12 == 5)
- sceneHandler27_sub02();
+ if (g_vars->scene27_wipeIsNeeded) {
+ if (g_vars->scene27_numLostBats == 5)
+ sceneHandler27_regenBats();
}
}
@@ -694,7 +695,7 @@ int sceneHandler27(ExCommand *cmd) {
break;
case MSG_SC27_STARTWIPE:
- g_vars->scene27_var10 = 1;
+ g_vars->scene27_wipeIsNeeded = true;
g_fp->playSound(SND_27_027, 0);
@@ -737,7 +738,7 @@ int sceneHandler27(ExCommand *cmd) {
if (g_vars->scene27_dudeIsAiming)
sceneHandler27_aimDude();
- if (g_vars->scene27_var10) {
+ if (g_vars->scene27_wipeIsNeeded) {
sceneHandler27_sub07();
if (!g_fp->_aniMan->_movement && g_fp->_aniMan->_statics->_staticsId == ST_MAN_RIGHT)
Commit: 1970bf81e5591e95a9c5c5aa682afacc05327886
https://github.com/scummvm/scummvm/commit/1970bf81e5591e95a9c5c5aa682afacc05327886
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-10T13:30:36-08:00
Commit Message:
FULLPIPE: Finish renames in scene27. This completes the scene
Changed paths:
engines/fullpipe/scenes/scene27.cpp
diff --git a/engines/fullpipe/scenes/scene27.cpp b/engines/fullpipe/scenes/scene27.cpp
index 2b928b8..8623b2b 100644
--- a/engines/fullpipe/scenes/scene27.cpp
+++ b/engines/fullpipe/scenes/scene27.cpp
@@ -33,7 +33,7 @@
#include "fullpipe/interaction.h"
#include "fullpipe/behavior.h"
-#define DBG 1
+#define DBG 0
namespace Fullpipe {
@@ -308,7 +308,7 @@ void sceneHandler27_startAiming() {
g_fp->_aniMan->_movement->setDynamicPhaseIndex(phase);
}
-void sceneHandler27_sub04(ExCommand *cmd) {
+void sceneHandler27_initAiming(ExCommand *cmd) {
g_vars->scene27_aimStartX = cmd->_x;
g_vars->scene27_aimStartY = cmd->_y;
g_vars->scene27_dudeIsAiming = true;
@@ -328,9 +328,9 @@ void sceneHandler27_aimDude() {
g_fp->_aniMan->_movement->setDynamicPhaseIndex(phase);
}
-void sceneHandler27_sub07() {
+void sceneHandler27_wipeDo() {
for (uint i = 0; i < g_vars->scene27_bats.size(); i++) {
- if (g_vars->scene27_bats[i]->currX < 800.0 ) {
+ if (g_vars->scene27_bats[i]->currX < 800.0) {
g_vars->scene27_bats[i]->field_10 = atan2(800.0 - g_vars->scene27_bats[i]->currX, 520.0 - g_vars->scene27_bats[i]->currY);
g_vars->scene27_bats[i]->power += 1.0;
}
@@ -720,7 +720,7 @@ int sceneHandler27(ExCommand *cmd) {
case 29:
if (g_fp->_aniMan == g_fp->_currentScene->getStaticANIObjectAtPos(g_fp->_sceneRect.left + cmd->_x, g_fp->_sceneRect.top + cmd->_y)
&& g_vars->scene27_maxPhaseReached)
- sceneHandler27_sub04(cmd);
+ sceneHandler27_initAiming(cmd);
break;
@@ -739,7 +739,7 @@ int sceneHandler27(ExCommand *cmd) {
sceneHandler27_aimDude();
if (g_vars->scene27_wipeIsNeeded) {
- sceneHandler27_sub07();
+ sceneHandler27_wipeDo();
if (!g_fp->_aniMan->_movement && g_fp->_aniMan->_statics->_staticsId == ST_MAN_RIGHT)
g_fp->_aniMan->startAnim(MV_MAN27_FLOW, 0, -1);
More information about the Scummvm-git-logs
mailing list