aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe
diff options
context:
space:
mode:
authorEugene Sandulenko2013-12-30 00:59:50 +0200
committerEugene Sandulenko2013-12-30 00:59:50 +0200
commitf794f6ae5b25acc6ddd4ba6085661a65cf1ed023 (patch)
treed74f58bb42b78a439e7b0db3aca17219d198b03c /engines/fullpipe
parent1b0bcfd64bf306db859ec8aeae04f37b219e1fd2 (diff)
downloadscummvm-rg350-f794f6ae5b25acc6ddd4ba6085661a65cf1ed023.tar.gz
scummvm-rg350-f794f6ae5b25acc6ddd4ba6085661a65cf1ed023.tar.bz2
scummvm-rg350-f794f6ae5b25acc6ddd4ba6085661a65cf1ed023.zip
FULLPIPE: Give scene13 vars meaningful names. This completes the scene.
Diffstat (limited to 'engines/fullpipe')
-rw-r--r--engines/fullpipe/scenes.cpp5
-rw-r--r--engines/fullpipe/scenes.h5
-rw-r--r--engines/fullpipe/scenes/scene13.cpp13
3 files changed, 10 insertions, 13 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 9bdd334e41..d1a5eff238 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -195,9 +195,8 @@ Vars::Vars() {
scene13_handleR = 0;
scene13_handleL = 0;
scene13_bridge = 0;
- scene13_var01 = 0;
- scene13_var02 = 0;
- scene13_var03 = 0;
+ scene13_guardDirection = false;
+ scene13_dudeX = 0;
scene15_chantingCountdown = 0;
scene15_plusminus = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index c9600fa113..e75cec0151 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -266,9 +266,8 @@ public:
StaticANIObject *scene13_handleR;
StaticANIObject *scene13_handleL;
StaticANIObject *scene13_bridge;
- int scene13_var01;
- int scene13_var02;
- int scene13_var03;
+ bool scene13_guardDirection;
+ int scene13_dudeX;
int scene15_chantingCountdown;
StaticANIObject *scene15_plusminus;
diff --git a/engines/fullpipe/scenes/scene13.cpp b/engines/fullpipe/scenes/scene13.cpp
index 1a080d2d45..0a0c2f3906 100644
--- a/engines/fullpipe/scenes/scene13.cpp
+++ b/engines/fullpipe/scenes/scene13.cpp
@@ -42,8 +42,7 @@ void scene13_initScene(Scene *sc) {
g_vars->scene13_handleR = sc->getStaticANIObject1ById(ANI_HANDLE_R, -1);
g_vars->scene13_handleL = sc->getStaticANIObject1ById(ANI_HANDLE_L, -1);
g_vars->scene13_bridge = sc->getStaticANIObject1ById(ANI_BRIDGE, -1);
- g_vars->scene13_var01 = 0;
- g_vars->scene13_var02 = 1;
+ g_vars->scene13_guardDirection = true;
MovGraphLink *lnk = getSc2MctlCompoundBySceneId(sc->_sceneId)->getLinkByName(sO_Bridge);
Scene *oldsc = g_fp->_currentScene;
@@ -336,7 +335,7 @@ int sceneHandler13(ExCommand *cmd) {
if (g_fp->_aniMan2) {
x = g_fp->_aniMan2->_ox;
- g_vars->scene13_var03 = x;
+ g_vars->scene13_dudeX = x;
if (x < g_fp->_sceneRect.left + 200)
g_fp->_currentScene->_x = x - g_fp->_sceneRect.left - 300;
@@ -346,15 +345,15 @@ int sceneHandler13(ExCommand *cmd) {
res = 1;
} else {
- x = g_vars->scene13_var03;
+ x = g_vars->scene13_dudeX;
}
- if (g_vars->scene13_var02) {
+ if (g_vars->scene13_guardDirection) {
if (x < 1022) {
sceneHandler13_walkForward(1);
sceneHandler13_walkBackward(0);
- g_vars->scene13_var02 = 0;
+ g_vars->scene13_guardDirection = false;
g_fp->_behaviorManager->updateBehaviors();
g_fp->startSceneTrack();
@@ -365,7 +364,7 @@ int sceneHandler13(ExCommand *cmd) {
sceneHandler13_walkForward(0);
sceneHandler13_walkBackward(1);
- g_vars->scene13_var02 = 1;
+ g_vars->scene13_guardDirection = true;
}
g_fp->_behaviorManager->updateBehaviors();