[Scummvm-cvs-logs] scummvm master -> e5a9d644ea7ced7c04962e18b0279f4e0e5cb103

[sev-]

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

Summary:
e5a9d644ea FULLPIPE: Renames in scene09


Commit: e5a9d644ea7ced7c04962e18b0279f4e0e5cb103
    https://github.com/scummvm/scummvm/commit/e5a9d644ea7ced7c04962e18b0279f4e0e5cb103
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-24T14:09:29-08:00

Commit Message:
FULLPIPE: Renames in scene09

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



diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index 1c82110..707db40 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -171,15 +171,15 @@ Vars::Vars() {
 	scene09_var13 = 0;
 	scene09_var15 = 0;
 	scene09_var17 = 0;
-	scene09_var19 = 0;
-	scene09_var18[0].x = 0;
-	scene09_var18[0].y = -15;
-	scene09_var18[1].x = 15;
-	scene09_var18[1].y = 0;
-	scene09_var18[2].x = 0;
-	scene09_var18[2].y = 0;
-	scene09_var18[3].x = 0;
-	scene09_var18[3].y = 0;
+	scene09_clickY = 0;
+	scene09_hangerOffsets[0].x = 0;
+	scene09_hangerOffsets[0].y = -15;
+	scene09_hangerOffsets[1].x = 15;
+	scene09_hangerOffsets[1].y = 0;
+	scene09_hangerOffsets[2].x = 0;
+	scene09_hangerOffsets[2].y = 0;
+	scene09_hangerOffsets[3].x = 0;
+	scene09_hangerOffsets[3].y = 0;
 
 	scene10_gum = 0;
 	scene10_packet = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 8b82101..0b8b933 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -366,8 +366,8 @@ public:
 	int scene09_var13;
 	int scene09_var15;
 	int scene09_var17;
-	int scene09_var19;
-	Common::Point scene09_var18[4];
+	int scene09_clickY;
+	Common::Point scene09_hangerOffsets[4];
 
 	StaticANIObject *scene10_gum;
 	StaticANIObject *scene10_packet;
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index dcd6b83..a0c4c3f 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -558,7 +558,7 @@ void sceneHandler09_checkHangerCollide() {
 
 		for (int i = 0; i < g_vars->scene09_numMovingHangers; i++) {
 			for (int j = 0; j < 4; j++) {
-				g_vars->scene09_hangers[i]->ani->getPixelAtPos(newx + g_vars->scene09_var18[j].x, ball->ani->_oy + g_vars->scene09_var18[j].y, &pixel);
+				g_vars->scene09_hangers[i]->ani->getPixelAtPos(newx + g_vars->scene09_hangerOffsets[j].x, ball->ani->_oy + g_vars->scene09_hangerOffsets[j].y, &pixel);
 
 				if (pixel) {
 					sceneHandler09_ballExplode(ball);
@@ -575,7 +575,7 @@ void sceneHandler09_hangerStartCycle() {
 	if (ani->_movement) {
 		ani->startAnim(MV_VSN_CYCLE2, 0, -1);
 		g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->field_8 = 0;
-		g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->phase = g_vars->scene09_var11 + (g_fp->_mouseScreenPos.y - g_vars->scene09_var19) / 2;
+		g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->phase = g_vars->scene09_var11 + (g_fp->_mouseScreenPos.y - g_vars->scene09_clickY) / 2;
 
 		if (g_vars->scene09_var12 != -1000 && g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->phase != g_vars->scene09_var12) {
 			ExCommand *ex = new ExCommand(0, 35, SND_9_019, 0, 0, 0, 1, 0, 0, 0);
@@ -707,7 +707,7 @@ int sceneHandler09(ExCommand *cmd) {
 						g_vars->scene09_var11 = g_vars->scene09_hangers[hng]->phase;
 						g_vars->scene09_var12 = g_vars->scene09_hangers[hng]->phase;
 
-						g_vars->scene09_var19 = cmd->_y;
+						g_vars->scene09_clickY = cmd->_y;
 
 						if (!g_vars->scene09_hangers[hng]->ani->_movement || g_vars->scene09_hangers[hng]->ani->_movement->_id != MV_VSN_CYCLE2) {
 							g_vars->scene09_hangers[hng]->ani->changeStatics2(ST_VSN_NORMAL);