aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2014-01-06 01:19:22 +0200
committerEugene Sandulenko2014-01-06 01:19:22 +0200
commitb0b3e918812334426e108fee212df657c8056676 (patch)
tree37cdf2ab6ed5ef839c848d67e6ad0b07d8be15e4 /engines
parent073241dea78dc82e00064308dc8cdda2d02c1f32 (diff)
downloadscummvm-rg350-b0b3e918812334426e108fee212df657c8056676.tar.gz
scummvm-rg350-b0b3e918812334426e108fee212df657c8056676.tar.bz2
scummvm-rg350-b0b3e918812334426e108fee212df657c8056676.zip
FULLPIPE: Renames in scene26. This completes the scene
Diffstat (limited to 'engines')
-rw-r--r--engines/fullpipe/scenes.cpp6
-rw-r--r--engines/fullpipe/scenes.h6
-rw-r--r--engines/fullpipe/scenes/scene26.cpp36
3 files changed, 18 insertions, 30 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 322c7d75e0..50335a4a85 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -296,11 +296,7 @@ Vars::Vars() {
scene26_drop = 0;
scene26_sockPic = 0;
scene26_sock = 0;
- scene26_var01 = 0;
- scene26_var02 = 0;
- scene26_var03 = 0;
- scene26_var04 = 0;
- scene26_var05 = 0;
+ scene26_activeVent = 0;
scene30_leg = 0;
scene30_liftFlag = 1;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index f2843b251d..169ee8b2d5 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -420,11 +420,7 @@ public:
StaticANIObject *scene26_drop;
PictureObject *scene26_sockPic;
StaticANIObject *scene26_sock;
- int scene26_var01;
- int scene26_var02;
- int scene26_var03;
- int scene26_var04;
- StaticANIObject *scene26_var05;
+ StaticANIObject *scene26_activeVent;
StaticANIObject *scene30_leg;
int scene30_liftFlag;
diff --git a/engines/fullpipe/scenes/scene26.cpp b/engines/fullpipe/scenes/scene26.cpp
index 8a0a39e5af..91679347e6 100644
--- a/engines/fullpipe/scenes/scene26.cpp
+++ b/engines/fullpipe/scenes/scene26.cpp
@@ -41,10 +41,6 @@ void scene26_initScene(Scene *sc) {
g_vars->scene26_drop = sc->getStaticANIObject1ById(ANI_DROP_26, -1);
g_vars->scene26_sockPic = sc->getPictureObjectById(PIC_SC26_SOCK, 0);
g_vars->scene26_sock = sc->getStaticANIObject1ById(ANI_SOCK_26, -1);
- g_vars->scene26_var01 = 200;
- g_vars->scene26_var02 = 200;
- g_vars->scene26_var03 = 300;
- g_vars->scene26_var04 = 300;
if (g_fp->getObjectState(sO_Hatch_26) == g_fp->getObjectEnumState(sO_Hatch_26, sO_WithSock)) {
g_fp->setObjectState(sO_Hatch_26, g_fp->getObjectEnumState(sO_Hatch_26, sO_Closed));
@@ -121,10 +117,10 @@ void sceneHandler26_hideChi() {
}
void sceneHandler26_testVent() {
- if (!g_vars->scene26_var05)
+ if (!g_vars->scene26_activeVent)
return;
- if (g_vars->scene26_var05->_okeyCode == 0) {
+ if (g_vars->scene26_activeVent->_okeyCode == 0) {
if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Opened))
g_fp->stopAllSoundInstances(SND_26_018);
else
@@ -141,7 +137,7 @@ void sceneHandler26_testVent() {
g_fp->playSound(SND_26_020, 0);
}
- } else if (g_vars->scene26_var05->_okeyCode == 1) {
+ } else if (g_vars->scene26_activeVent->_okeyCode == 1) {
if (g_fp->getObjectState(sO_Valve2_26) == g_fp->getObjectEnumState(sO_Valve2_26, sO_Opened))
g_fp->playSound(SND_26_020, 0);
else
@@ -156,7 +152,7 @@ void sceneHandler26_testVent() {
chainQueue(QU_SC26_AUTOCLOSE1, 0);
}
- } else if (g_vars->scene26_var05->_okeyCode == 2) {
+ } else if (g_vars->scene26_activeVent->_okeyCode == 2) {
if (g_fp->getObjectState(sO_Valve3_26) == g_fp->getObjectEnumState(sO_Valve3_26, sO_Opened))
g_fp->playSound(SND_26_020, 0);
else
@@ -176,24 +172,24 @@ void sceneHandler26_testVent() {
}
void sceneHandler26_showVent() {
- if (g_vars->scene26_var05) {
- int id = g_vars->scene26_var05->_statics->_staticsId;
+ if (g_vars->scene26_activeVent) {
+ int id = g_vars->scene26_activeVent->_statics->_staticsId;
if (id == ST_VNT26_UP2) {
- g_vars->scene26_var05->changeStatics2(ST_VNT26_RIGHT2);
+ g_vars->scene26_activeVent->changeStatics2(ST_VNT26_RIGHT2);
} else {
if (id != ST_VNT26_RIGHT2)
return;
- g_vars->scene26_var05->changeStatics2(ST_VNT26_UP2);
+ g_vars->scene26_activeVent->changeStatics2(ST_VNT26_UP2);
}
- g_vars->scene26_var05->show1(-1, -1, -1, 0);
+ g_vars->scene26_activeVent->show1(-1, -1, -1, 0);
}
}
void sceneHandler26_hideVent() {
- if (g_vars->scene26_var05)
- g_vars->scene26_var05->hide();
+ if (g_vars->scene26_activeVent)
+ g_vars->scene26_activeVent->hide();
}
void sceneHandler26_animateVents(StaticANIObject *ani) {
@@ -255,7 +251,7 @@ void sceneHandler26_animateVents(StaticANIObject *ani) {
void sceneHandler26_clickVent(StaticANIObject *ani, ExCommand *cmd) {
if (ani->_okeyCode || g_fp->getObjectState(sO_Hatch_26) == g_fp->getObjectEnumState(sO_Hatch_26, sO_Opened)) {
if (g_fp->_aniMan->isIdle() && !(g_fp->_aniMan->_flags & 0x100)) {
- g_vars->scene26_var05 = ani;
+ g_vars->scene26_activeVent = ani;
int x = ani->_ox - 20;
int y = ani->_oy + 61;
@@ -339,11 +335,11 @@ int sceneHandler26(ExCommand *cmd) {
if (g_fp->_aniMan2) {
int x = g_fp->_aniMan2->_ox;
- if (x < g_fp->_sceneRect.left + g_vars->scene26_var01)
- g_fp->_currentScene->_x = x - g_vars->scene26_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->scene26_var01)
- g_fp->_currentScene->_x = x + g_vars->scene26_var03 - g_fp->_sceneRect.right;
+ if (x > g_fp->_sceneRect.right - 200)
+ g_fp->_currentScene->_x = x + 300 - g_fp->_sceneRect.right;
}
g_fp->_behaviorManager->updateBehaviors();