[Scummvm-cvs-logs] scummvm master -> 5822ce9659c341d3adb3c8c8483d1c6d2df914d8

sev- sev at scummvm.org
Sat Dec 28 21:29:38 CET 2013


This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b24b1880be FULLPIPE: Initial implementation of scene24_initScene()
0af0d2bc6a FULLPIPE: Plug scene24 in
d751e719ac FULLPIPE: Implement scene24_setPoolState()
e488d35454 FULLPIPE: Implement sceneHandler24()
5822ce9659 FULLPIPE: Complete scene24


Commit: b24b1880beb9dd867dba7629f9bb47fa9c89a1b2
    https://github.com/scummvm/scummvm/commit/b24b1880beb9dd867dba7629f9bb47fa9c89a1b2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T11:59:16-08:00

Commit Message:
FULLPIPE: Initial implementation of scene24_initScene()

Changed paths:
  A engines/fullpipe/scenes/scene24.cpp
    engines/fullpipe/init.cpp
    engines/fullpipe/objectnames.h



diff --git a/engines/fullpipe/init.cpp b/engines/fullpipe/init.cpp
index 4cf5fbe..d933e0f 100644
--- a/engines/fullpipe/init.cpp
+++ b/engines/fullpipe/init.cpp
@@ -84,7 +84,7 @@ void FullpipeEngine::initObjectStates() {
 	setObjectState(sO_Lever_23, getObjectEnumState(sO_Lever_23, sO_NotTaken));
 	setObjectState(sO_LeverHandle_23, getObjectEnumState(sO_LeverHandle_23, sO_WithoutStool));
 	setObjectState(sO_LowerPipe_21, getObjectEnumState(sO_LowerPipe_21, sO_IsClosed));
-	setObjectState(sO_StarsDown_24, getObjectEnumState(sO_StarsDown_24, sO_IsOpened));
+	setObjectState(sO_StairsDown_24, getObjectEnumState(sO_StairsDown_24, sO_IsOpened));
 	setObjectState(sO_Hatch_26, getObjectEnumState(sO_Hatch_26, sO_Closed));
 	setObjectState(sO_Sock_26, getObjectEnumState(sO_Sock_26, sO_NotHanging));
 	setObjectState(sO_LeftPipe_26, getObjectEnumState(sO_LeftPipe_26, sO_IsClosed));
diff --git a/engines/fullpipe/objectnames.h b/engines/fullpipe/objectnames.h
index 87442d9..023e070 100644
--- a/engines/fullpipe/objectnames.h
+++ b/engines/fullpipe/objectnames.h
@@ -114,7 +114,7 @@ namespace Fullpipe {
 #define sO_LeftPipe_29 "\xcb\xe5\xe2\xe0\xff \xf2\xf0\xf3\xe1\xe0_29"	// "Левая труба_29"
 #define sO_LeftPipe_30 "\xcb\xe5\xe2\xe0\xff \xf2\xf0\xf3\xe1\xe0_30"	// "Левая труба_30"
 #define sO_LeftPipe_37 "\xcb\xe5\xe2\xe0\xff \xf2\xf0\xf3\xe1\xe0_37"	// "Левая труба_37"
-#define sO_StarsDown_24 "\xcb\xe5\xf1\xf2\xed\xe8\xf6\xe0 \xe2\xed\xe8\xe7_24"	// "Лестница вниз_24"
+#define sO_StairsDown_24 "\xcb\xe5\xf1\xf2\xed\xe8\xf6\xe0 \xe2\xed\xe8\xe7_24"	// "Лестница вниз_24"
 #define sO_StairsUp_8 "\xcb\xe5\xf1\xf2\xed\xe8\xf6\xe0 \xf1\xe2\xe5\xf0\xf5\xf3_8"	// "Лестница сверху_8"
 #define sO_Stairway "\xcb\xe5\xf1\xf2\xed\xe8\xf6\xe0"	// "Лестница"
 #define sO_Fliers "\xcb\xe5\xf2\xf3\xed\xfb"	// "Летуны"
diff --git a/engines/fullpipe/scenes/scene24.cpp b/engines/fullpipe/scenes/scene24.cpp
new file mode 100644
index 0000000..3123e9e
--- /dev/null
+++ b/engines/fullpipe/scenes/scene24.cpp
@@ -0,0 +1,84 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "fullpipe/fullpipe.h"
+
+#include "fullpipe/objectnames.h"
+#include "fullpipe/constants.h"
+
+#include "fullpipe/gameloader.h"
+#include "fullpipe/motion.h"
+#include "fullpipe/scenes.h"
+#include "fullpipe/statics.h"
+
+#include "fullpipe/interaction.h"
+#include "fullpipe/behavior.h"
+
+
+namespace Fullpipe {
+
+void scene24_initScene(Scene *sc) {
+	g_vars->scene24_var01 = 200;
+	g_vars->scene24_var02 = 200;
+	g_vars->scene24_var03 = 300;
+	g_vars->scene24_var04 = 300;
+
+	g_vars->scene24_water = sc->getStaticANIObject1ById(ANI_WATER24, -1);
+	g_vars->scene24_jet = sc->getStaticANIObject1ById(ANI_JET24, -1);
+	g_vars->scene24_drop = sc->getStaticANIObject1ById(ANI_DROP_24, -1);
+
+	g_vars->scene24_water->setAlpha(0xa0);
+	g_vars->scene24_jet->setAlpha(0xa0);
+	g_vars->scene24_drop->setAlpha(0xa0);
+
+	Scene *oldsc = g_fp->_currentScene;
+	g_fp->_currentScene = sc;
+
+	if (g_fp->getObjectState(sO_Pool) == g_fp->getObjectEnumState(sO_Pool, sO_Overfull)) {
+		g_vars->scene24_var05 = 1;
+		g_vars->scene24_var06 = 0;
+	} else {
+		g_vars->scene24_jet->hide();
+
+		g_vars->scene24_var05 = 0;
+
+		g_vars->scene24_water->changeStatics2(ST_WTR24_FLOWLOWER);
+
+		g_vars->scene24_var06 = 1;
+	}
+
+	if (g_fp->getObjectState(sO_Pool) < g_fp->getObjectEnumState(sO_Pool, sO_Full)) {
+		g_vars->scene24_var07 = 0;
+
+		g_vars->scene24_water->hide();
+
+		g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsOpened))
+	} else {
+		g_vars->scene24_var07 = 1;
+
+		g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsClosed))
+	}
+
+	g_fp->_currentScene = oldsc;
+}
+
+} // End of namespace Fullpipe


Commit: 0af0d2bc6a28d312f2f284c4ebc3963e0e3be93e
    https://github.com/scummvm/scummvm/commit/0af0d2bc6a28d312f2f284c4ebc3963e0e3be93e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T12:04:12-08:00

Commit Message:
FULLPIPE: Plug scene24 in

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/module.mk
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h
    engines/fullpipe/scenes/scene24.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 7fd97d2..230d2d4 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -551,6 +551,12 @@ namespace Fullpipe {
 #define ST_GMS_BOOT 1270
 #define ST_GMS_BOOTLESS2 3316
 
+// Scene 24
+#define ANI_DROP_24 3505
+#define ANI_JET24 1837
+#define ANI_WATER24 1834
+#define ST_WTR24_FLOWLOWER 1843
+
 } // End of namespace Fullpipe
 
 #endif /* FULLPIPE_CONSTANTS_H */
diff --git a/engines/fullpipe/module.mk b/engines/fullpipe/module.mk
index 6f8fbe2..9720469 100644
--- a/engines/fullpipe/module.mk
+++ b/engines/fullpipe/module.mk
@@ -36,6 +36,7 @@ MODULE_OBJS = \
 	scenes/scene11.o \
 	scenes/scene12.o \
 	scenes/scene15.o \
+	scenes/scene24.o \
 	scenes/sceneDbg.o \
 	scenes/sceneIntro.o
 
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 0a83d1b..3bac1db 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -195,6 +195,17 @@ Vars::Vars() {
 	scene15_ladder = 0;
 	scene15_boot = 0;
 
+	scene24_var01 = 0;
+	scene24_var02 = 0;
+	scene24_var03 = 0;
+	scene24_var04 = 0;
+	scene24_var05 = 0;
+	scene24_var06 = 0;
+	scene24_var07 = 0;
+	scene24_water = 0;
+	scene24_jet = 0;
+	scene24_drop = 0;
+
 	selector = 0;
 }
 
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 281e350..9788a2e 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -259,6 +259,17 @@ public:
 	PictureObject *scene15_ladder;
 	StaticANIObject *scene15_boot;
 
+	int scene24_var01;
+	int scene24_var02;
+	int scene24_var03;
+	int scene24_var04;
+	int scene24_var05;
+	int scene24_var06;
+	int scene24_var07;
+	StaticANIObject *scene24_water;
+	StaticANIObject *scene24_jet;
+	StaticANIObject *scene24_drop;
+
 	PictureObject *selector;
 };
 
diff --git a/engines/fullpipe/scenes/scene24.cpp b/engines/fullpipe/scenes/scene24.cpp
index 3123e9e..1bf8edb 100644
--- a/engines/fullpipe/scenes/scene24.cpp
+++ b/engines/fullpipe/scenes/scene24.cpp
@@ -71,11 +71,11 @@ void scene24_initScene(Scene *sc) {
 
 		g_vars->scene24_water->hide();
 
-		g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsOpened))
+		g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsOpened));
 	} else {
 		g_vars->scene24_var07 = 1;
 
-		g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsClosed))
+		g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsClosed));
 	}
 
 	g_fp->_currentScene = oldsc;


Commit: d751e719acfadfda42cba096bbcec8ff73030823
    https://github.com/scummvm/scummvm/commit/d751e719acfadfda42cba096bbcec8ff73030823
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T12:14:38-08:00

Commit Message:
FULLPIPE: Implement scene24_setPoolState()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes/scene24.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 230d2d4..53af8c6 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -555,6 +555,12 @@ namespace Fullpipe {
 #define ANI_DROP_24 3505
 #define ANI_JET24 1837
 #define ANI_WATER24 1834
+#define QU_DRP24_TOFLOOR 3510
+#define QU_DRP24_TOWATER 3509
+#define QU_DRP24_TOWATER2 4046
+#define SND_24_006 4041
+#define SND_24_007 4042
+#define ST_DRP24_EMPTY 3507
 #define ST_WTR24_FLOWLOWER 1843
 
 } // End of namespace Fullpipe
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 3bac1db..c3bddf5 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -625,7 +625,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		scene->initObjectCursors("SC_24");
 		setSceneMusicParameters(sceneVar);
 		addMessageHandler(sceneHandler24, 2);
-		scene24_sub_423DD0();
+		scene24_setPoolState();
 		_updateCursorCallback = defaultUpdateCursor;
 		break;
 
diff --git a/engines/fullpipe/scenes/scene24.cpp b/engines/fullpipe/scenes/scene24.cpp
index 1bf8edb..dc92044 100644
--- a/engines/fullpipe/scenes/scene24.cpp
+++ b/engines/fullpipe/scenes/scene24.cpp
@@ -81,4 +81,26 @@ void scene24_initScene(Scene *sc) {
 	g_fp->_currentScene = oldsc;
 }
 
+void scene24_setPoolState() {
+	if (g_fp->getObjectState(sO_Pool) == g_fp->getObjectEnumState(sO_Pool, sO_Overfull)) {
+		g_fp->_behaviorManager->setFlagByStaticAniObject(g_vars->scene24_drop, 0);
+
+		g_fp->playSound(SND_24_007, 1);
+	} else if (g_fp->getObjectState(sO_Pool) == g_fp->getObjectEnumState(sO_Pool, sO_Full)) {
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOFLOOR, 0);
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOWATER, 1);
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOWATER2, 0);
+
+		g_fp->playSound(SND_24_006, 1);
+	} else if (g_fp->getObjectState(sO_Pool) == g_fp->getObjectEnumState(sO_Pool, sO_HalfFull)) {
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOFLOOR, 0);
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOWATER, 0);
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOWATER2, 1);
+	} else {
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOFLOOR, 1);
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOWATER, 0);
+		g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene24_drop, ST_DRP24_EMPTY, QU_DRP24_TOWATER2, 0);
+	}
+}
+
 } // End of namespace Fullpipe


Commit: e488d35454e68c5b303630f45665a2d54a7e6290
    https://github.com/scummvm/scummvm/commit/e488d35454e68c5b303630f45665a2d54a7e6290
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T12:22:32-08:00

Commit Message:
FULLPIPE: Implement sceneHandler24()

Changed paths:
    engines/fullpipe/constants.h
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h
    engines/fullpipe/scenes/scene24.cpp



diff --git a/engines/fullpipe/constants.h b/engines/fullpipe/constants.h
index 53af8c6..5f45ba0 100644
--- a/engines/fullpipe/constants.h
+++ b/engines/fullpipe/constants.h
@@ -555,6 +555,9 @@ namespace Fullpipe {
 #define ANI_DROP_24 3505
 #define ANI_JET24 1837
 #define ANI_WATER24 1834
+#define MV_WTR24_FLOW 1835
+#define MV_WTR24_FLOWLOWER 1844
+#define MV_JET24_FLOW 1838
 #define QU_DRP24_TOFLOOR 3510
 #define QU_DRP24_TOWATER 3509
 #define QU_DRP24_TOWATER2 4046
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index c3bddf5..c744cd2 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -195,10 +195,6 @@ Vars::Vars() {
 	scene15_ladder = 0;
 	scene15_boot = 0;
 
-	scene24_var01 = 0;
-	scene24_var02 = 0;
-	scene24_var03 = 0;
-	scene24_var04 = 0;
 	scene24_var05 = 0;
 	scene24_var06 = 0;
 	scene24_var07 = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 9788a2e..211dd07 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -259,10 +259,6 @@ public:
 	PictureObject *scene15_ladder;
 	StaticANIObject *scene15_boot;
 
-	int scene24_var01;
-	int scene24_var02;
-	int scene24_var03;
-	int scene24_var04;
 	int scene24_var05;
 	int scene24_var06;
 	int scene24_var07;
diff --git a/engines/fullpipe/scenes/scene24.cpp b/engines/fullpipe/scenes/scene24.cpp
index dc92044..4b141a3 100644
--- a/engines/fullpipe/scenes/scene24.cpp
+++ b/engines/fullpipe/scenes/scene24.cpp
@@ -37,11 +37,6 @@
 namespace Fullpipe {
 
 void scene24_initScene(Scene *sc) {
-	g_vars->scene24_var01 = 200;
-	g_vars->scene24_var02 = 200;
-	g_vars->scene24_var03 = 300;
-	g_vars->scene24_var04 = 300;
-
 	g_vars->scene24_water = sc->getStaticANIObject1ById(ANI_WATER24, -1);
 	g_vars->scene24_jet = sc->getStaticANIObject1ById(ANI_JET24, -1);
 	g_vars->scene24_drop = sc->getStaticANIObject1ById(ANI_DROP_24, -1);
@@ -103,4 +98,32 @@ void scene24_setPoolState() {
 	}
 }
 
+int sceneHandler24(ExCommand *cmd) {
+	if (cmd->_messageKind == 17 && cmd->_messageNum == 33) {
+		if (g_fp->_aniMan2) {
+			int x = g_fp->_aniMan2->_ox;
+
+			if (x < g_fp->_sceneRect.left + 200) {
+				g_fp->_currentScene->_x = x - 300 - g_fp->_sceneRect.left;
+			}
+			if (x > g_fp->_sceneRect.right - 200)
+				g_fp->_currentScene->_x = x +  300 - g_fp->_sceneRect.right;
+		}
+
+		if (g_vars->scene24_var07 && !g_vars->scene24_water->_movement) {
+			if (g_vars->scene24_var06)
+				g_vars->scene24_water->startAnim(MV_WTR24_FLOWLOWER, 0, -1);
+			else
+				g_vars->scene24_water->startAnim(MV_WTR24_FLOW, 0, -1);
+		}
+
+		if (g_vars->scene24_var05 && !g_vars->scene24_jet->_movement)
+			g_vars->scene24_jet->startAnim(MV_JET24_FLOW, 0, -1);
+
+		g_fp->_behaviorManager->updateBehaviors();
+	}
+
+	return 0;
+}
+
 } // End of namespace Fullpipe


Commit: 5822ce9659c341d3adb3c8c8483d1c6d2df914d8
    https://github.com/scummvm/scummvm/commit/5822ce9659c341d3adb3c8c8483d1c6d2df914d8
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-28T12:28:54-08:00

Commit Message:
FULLPIPE: Complete scene24

Changed paths:
    engines/fullpipe/scenes.cpp
    engines/fullpipe/scenes.h
    engines/fullpipe/scenes/scene24.cpp



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index c744cd2..a8e96a1 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -195,9 +195,9 @@ Vars::Vars() {
 	scene15_ladder = 0;
 	scene15_boot = 0;
 
-	scene24_var05 = 0;
-	scene24_var06 = 0;
-	scene24_var07 = 0;
+	scene24_jetIsOn = false;
+	scene24_flowIsLow = false;
+	scene24_waterIsOn = false;
 	scene24_water = 0;
 	scene24_jet = 0;
 	scene24_drop = 0;
@@ -612,6 +612,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		scene23_sub_423B00();
 		_updateCursorCallback = scene23_updateCursor;
 		break;
+#endif
 
 	case SC_24:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_24");
@@ -625,6 +626,7 @@ bool FullpipeEngine::sceneSwitcher(EntranceInfo *entrance) {
 		_updateCursorCallback = defaultUpdateCursor;
 		break;
 
+#if 0
 	case SC_25:
 		sceneVar = _gameLoader->_gameVar->getSubVarByName("SC_25");
 		scene->preloadMovements(sceneVar);
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 211dd07..88ad5e7 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -84,6 +84,10 @@ int scene15_updateCursor();
 void scene15_initScene(Scene *sc);
 int sceneHandler15(ExCommand *cmd);
 
+void scene24_initScene(Scene *sc);
+void scene24_setPoolState();
+int sceneHandler24(ExCommand *cmd);
+
 void sceneDbgMenu_initScene(Scene *sc);
 int sceneHandlerDbgMenu(ExCommand *cmd);
 
@@ -259,9 +263,9 @@ public:
 	PictureObject *scene15_ladder;
 	StaticANIObject *scene15_boot;
 
-	int scene24_var05;
-	int scene24_var06;
-	int scene24_var07;
+	bool scene24_jetIsOn;
+	bool scene24_flowIsLow;
+	bool scene24_waterIsOn;
 	StaticANIObject *scene24_water;
 	StaticANIObject *scene24_jet;
 	StaticANIObject *scene24_drop;
diff --git a/engines/fullpipe/scenes/scene24.cpp b/engines/fullpipe/scenes/scene24.cpp
index 4b141a3..7ab0d94 100644
--- a/engines/fullpipe/scenes/scene24.cpp
+++ b/engines/fullpipe/scenes/scene24.cpp
@@ -49,26 +49,26 @@ void scene24_initScene(Scene *sc) {
 	g_fp->_currentScene = sc;
 
 	if (g_fp->getObjectState(sO_Pool) == g_fp->getObjectEnumState(sO_Pool, sO_Overfull)) {
-		g_vars->scene24_var05 = 1;
-		g_vars->scene24_var06 = 0;
+		g_vars->scene24_jetIsOn = true;
+		g_vars->scene24_flowIsLow = false;
 	} else {
 		g_vars->scene24_jet->hide();
 
-		g_vars->scene24_var05 = 0;
+		g_vars->scene24_jetIsOn = false;
 
 		g_vars->scene24_water->changeStatics2(ST_WTR24_FLOWLOWER);
 
-		g_vars->scene24_var06 = 1;
+		g_vars->scene24_flowIsLow = true;
 	}
 
 	if (g_fp->getObjectState(sO_Pool) < g_fp->getObjectEnumState(sO_Pool, sO_Full)) {
-		g_vars->scene24_var07 = 0;
+		g_vars->scene24_waterIsOn = false;
 
 		g_vars->scene24_water->hide();
 
 		g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsOpened));
 	} else {
-		g_vars->scene24_var07 = 1;
+		g_vars->scene24_waterIsOn = true;
 
 		g_fp->setObjectState(sO_StairsDown_24, g_fp->getObjectEnumState(sO_StairsDown_24, sO_IsClosed));
 	}
@@ -110,14 +110,14 @@ int sceneHandler24(ExCommand *cmd) {
 				g_fp->_currentScene->_x = x +  300 - g_fp->_sceneRect.right;
 		}
 
-		if (g_vars->scene24_var07 && !g_vars->scene24_water->_movement) {
-			if (g_vars->scene24_var06)
+		if (g_vars->scene24_waterIsOn && !g_vars->scene24_water->_movement) {
+			if (g_vars->scene24_flowIsLow)
 				g_vars->scene24_water->startAnim(MV_WTR24_FLOWLOWER, 0, -1);
 			else
 				g_vars->scene24_water->startAnim(MV_WTR24_FLOW, 0, -1);
 		}
 
-		if (g_vars->scene24_var05 && !g_vars->scene24_jet->_movement)
+		if (g_vars->scene24_jetIsOn && !g_vars->scene24_jet->_movement)
 			g_vars->scene24_jet->startAnim(MV_JET24_FLOW, 0, -1);
 
 		g_fp->_behaviorManager->updateBehaviors();






More information about the Scummvm-git-logs mailing list