From 6212cc64aacb07141a8ba6d0fde747efc73b682e Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Thu, 2 Jan 2014 00:34:21 +0200
Subject: FULLPIPE: More renames in scene17

---
 engines/fullpipe/scenes.cpp         | 2 +-
 engines/fullpipe/scenes.h           | 2 +-
 engines/fullpipe/scenes/scene17.cpp | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'engines/fullpipe')

diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 3d81e1b2a9..899d215116 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -241,7 +241,7 @@ Vars::Vars() {
 
 	scene17_flyState = 0;
 	scene17_sugarIsShown = false;
-	scene17_var07 = 0;
+	scene17_sceneOldEdgeX = 0;
 	scene17_flyCountdown = 0;
 	scene17_hand = 0;
 	scene17_handPhase = false;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 0560813505..b4052f4d38 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -322,7 +322,7 @@ public:
 
 	int scene17_flyState;
 	bool scene17_sugarIsShown;
-	int scene17_var07;
+	int scene17_sceneOldEdgeX;
 	int scene17_flyCountdown;
 	StaticANIObject *scene17_hand;
 	bool scene17_handPhase;
diff --git a/engines/fullpipe/scenes/scene17.cpp b/engines/fullpipe/scenes/scene17.cpp
index 11bf7f2875..cd2a004804 100644
--- a/engines/fullpipe/scenes/scene17.cpp
+++ b/engines/fullpipe/scenes/scene17.cpp
@@ -39,7 +39,7 @@ namespace Fullpipe {
 void scene17_initScene(Scene *sc) {
 	g_vars->scene17_flyState = 1;
 	g_vars->scene17_sugarIsShown = false;
-	g_vars->scene17_var07 = 0;
+	g_vars->scene17_sceneOldEdgeX = 0;
 	g_vars->scene17_flyCountdown = 0;
 	g_vars->scene17_hand = sc->getStaticANIObject1ById(ANI_HAND17, -1);
 }
@@ -183,7 +183,7 @@ int sceneHandler17(ExCommand *cmd) {
 	case 33:
 		{
 			int x = g_vars->scene17_sceneEdgeX;
-			g_vars->scene17_var07 = g_vars->scene17_sceneEdgeX;
+			g_vars->scene17_sceneOldEdgeX = g_vars->scene17_sceneEdgeX;
 
 			if (g_fp->_aniMan2) {
 				x = g_fp->_aniMan2->_ox;
@@ -208,11 +208,11 @@ int sceneHandler17(ExCommand *cmd) {
 			}
 
 			if (g_vars->scene17_handPhase) {
-				if (g_vars->scene17_var07 < 410 && x >= 410) {
+				if (g_vars->scene17_sceneOldEdgeX < 410 && x >= 410) {
 					g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene17_hand, ST_HND17_EMPTY, QU_HND17_TOCYCLE, 0);
 					g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene17_hand, ST_HND17_ATTRACT, QU_HND17_ATTRACT, 0);
 					g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene17_hand, ST_HND17_EMPTY, QU_HND17_ASK, 1);
-				} else if (g_vars->scene17_var07 > 410 && x <= 410) {
+				} else if (g_vars->scene17_sceneOldEdgeX > 410 && x <= 410) {
 					g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene17_hand, ST_HND17_EMPTY, QU_HND17_TOCYCLE, 1);
 					g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene17_hand, ST_HND17_ATTRACT, QU_HND17_ATTRACT, 1);
 					g_fp->_behaviorManager->setBehaviorEnabled(g_vars->scene17_hand, ST_HND17_EMPTY, QU_HND17_ASK, 0);
-- 
cgit v1.2.3