FULLPIPE: Renames in scene35. This completes the scene

3 files changed, 19 insertions, 31 deletions

diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index a4bf2dc5eb..c61872f96a 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -348,14 +348,10 @@ Vars::Vars() {
 	scene34_dudeOnCactus = false;
 	scene34_fliesCountdown = 0;
 
-	scene35_var01 = 0;
-	scene35_var02 = 0;
-	scene35_var03 = 0;
-	scene35_var04 = 0;
 	scene35_hose = 0;
 	scene35_bellyInflater = 0;
-	scene35_var05 = 0;
-	scene35_var06 = 0;
+	scene35_flowCounter = 0;
+	scene35_fliesCounter = 0;
 
 	scene36_rotohrust = 0;
 	scene36_scissors = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 42a56be253..24da21c30d 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -491,14 +491,10 @@ public:
 	bool scene34_dudeOnCactus;
 	int scene34_fliesCountdown;
 
-	int scene35_var01;
-	int scene35_var02;
-	int scene35_var03;
-	int scene35_var04;
 	StaticANIObject *scene35_hose;
 	StaticANIObject *scene35_bellyInflater;
-	int scene35_var05;
-	int scene35_var06;
+	int scene35_flowCounter;
+	int scene35_fliesCounter;
 
 	StaticANIObject *scene36_rotohrust;
 	StaticANIObject *scene36_scissors;
diff --git a/engines/fullpipe/scenes/scene35.cpp b/engines/fullpipe/scenes/scene35.cpp
index e63938e555..290213c453 100644
--- a/engines/fullpipe/scenes/scene35.cpp
+++ b/engines/fullpipe/scenes/scene35.cpp
@@ -38,14 +38,10 @@
 namespace Fullpipe {
 
 void scene35_initScene(Scene *sc) {
-	g_vars->scene35_var01 = 200;
-	g_vars->scene35_var02 = 200;
-	g_vars->scene35_var03 = 300;
-	g_vars->scene35_var04 = 300;
 	g_vars->scene35_hose = sc->getStaticANIObject1ById(ANI_HOSE, -1);
 	g_vars->scene35_bellyInflater = sc->getStaticANIObject1ById(ANI_PUZODUV, -1);
-	g_vars->scene35_var05 = 0;
-	g_vars->scene35_var06 = 0;
+	g_vars->scene35_flowCounter = 0;
+	g_vars->scene35_fliesCounter = 0;
 
 	MovGraphLink *lnk = getSc2MctlCompoundBySceneId(sc->_sceneId)->getLinkByName(sO_CloseThing);
 
@@ -115,8 +111,8 @@ void sceneHandler35_startFlow() {
 
 			g_fp->playSound(SND_35_012, 1);
 		} else {
-			if (!g_vars->scene35_var05)
-				g_vars->scene35_var05 = 98;
+			if (!g_vars->scene35_flowCounter)
+				g_vars->scene35_flowCounter = 98;
 
 			g_fp->playSound(SND_35_011, 1);
 		}
@@ -150,7 +146,7 @@ void sceneHandler35_genFlies() {
 			g_fp->_floaters->_array2[g_fp->_floaters->_array2.size() - 1]->val11 = 8.0;
 		}
 
-		g_vars->scene35_var06 = 0;
+		g_vars->scene35_fliesCounter = 0;
 	}
 }
 
@@ -184,7 +180,7 @@ int sceneHandler35(ExCommand *cmd) {
 			g_fp->stopAllSoundInstances(SND_35_011);
 			g_fp->playSound(SND_35_012, 1);
 
-			g_vars->scene35_var05 = 0;
+			g_vars->scene35_flowCounter = 0;
 			break;
 		}
 		break;
@@ -235,23 +231,23 @@ int sceneHandler35(ExCommand *cmd) {
 		if (g_fp->_aniMan2) {
 			int x = g_fp->_aniMan2->_ox;
 
-			if (x < g_fp->_sceneRect.left + g_vars->scene35_var01)
-				g_fp->_currentScene->_x = x - g_vars->scene35_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->scene35_var01)
-				g_fp->_currentScene->_x = x + g_vars->scene35_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->scene35_var05 > 0) {
-			--g_vars->scene35_var05;
+		if (g_vars->scene35_flowCounter > 0) {
+			--g_vars->scene35_flowCounter;
 
-			if (!g_vars->scene35_var05)
+			if (!g_vars->scene35_flowCounter)
 				sceneHandler35_stopFlow();
 		}
 
-		g_vars->scene35_var06++;
+		g_vars->scene35_fliesCounter++;
 
-		if (g_vars->scene35_var06 >= 160)
+		if (g_vars->scene35_fliesCounter >= 160)
 			sceneHandler35_genFlies();
 
 		g_fp->_floaters->update();