From b6f4bce10c77d893a3c749f08dcc1227ec78a8bb Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 2 Jan 2014 15:15:27 +0200
Subject: FULLPIPE: Rename vars in scene36

---
 engines/fullpipe/scenes.cpp         |  4 ----
 engines/fullpipe/scenes.h           |  4 ----
 engines/fullpipe/scenes/scene36.cpp | 12 ++++--------
 3 files changed, 4 insertions(+), 16 deletions(-)

(limited to 'engines/fullpipe')

diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 7d02ec4a59..fa70b0a5e4 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -268,10 +268,6 @@ Vars::Vars() {
 	scene31_cactus = 0;
 	scene31_plusMinus = 0;
 
-	scene36_var01 = 0;
-	scene36_var02 = 0;
-	scene36_var03 = 0;
-	scene36_var04 = 0;
 	scene36_rotohrust = 0;
 	scene36_scissors = 0;
 
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index f1a10eecc7..fb3994910c 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -365,10 +365,6 @@ public:
 	StaticANIObject *scene31_cactus;
 	StaticANIObject *scene31_plusMinus;
 
-	int scene36_var01;
-	int scene36_var02;
-	int scene36_var03;
-	int scene36_var04;
 	StaticANIObject *scene36_rotohrust;
 	StaticANIObject *scene36_scissors;
 
diff --git a/engines/fullpipe/scenes/scene36.cpp b/engines/fullpipe/scenes/scene36.cpp
index b973ec9ccd..7d237fd395 100644
--- a/engines/fullpipe/scenes/scene36.cpp
+++ b/engines/fullpipe/scenes/scene36.cpp
@@ -37,10 +37,6 @@
 namespace Fullpipe {
 
 void scene36_initScene(Scene *sc) {
-	g_vars->scene36_var01 = 200;
-	g_vars->scene36_var02 = 200;
-	g_vars->scene36_var03 = 300;
-	g_vars->scene36_var04 = 300;
 	g_vars->scene36_rotohrust = sc->getStaticANIObject1ById(ANI_ROTOHRUST, -1);
 	g_vars->scene36_scissors = sc->getStaticANIObject1ById(ANI_SCISSORS_36, -1);
 }
@@ -79,11 +75,11 @@ int sceneHandler36(ExCommand *cmd) {
 		if (g_fp->_aniMan2) {
 			int x = g_fp->_aniMan2->_ox;
 
-			if (x < g_fp->_sceneRect.left + g_vars->scene36_var01)
-				g_fp->_currentScene->_x = x - g_vars->scene36_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->scene36_var01)
-				g_fp->_currentScene->_x = x + g_vars->scene36_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();
-- 
cgit v1.2.3