FULLPIPE: Renames in scene11. This completes the scene

scummvm · Dec 28, 2013 · 9a5e5c2 · 9a5e5c2
1 parent 2c35897
commit 9a5e5c2
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 97 deletions.
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
@@ -167,27 +167,25 @@ Vars::Vars() {
 	scene11_dudeOnSwing = 0;
 	scene11_hint = 0;
 	scene11_arcadeIsOn = false;
-	scene11_var03 = false;
-	scene11_var04 = false;
+	scene11_scrollIsEnabled = false;
+	scene11_scrollIsMaximized = false;
 	scene11_hintCounter = 0;
-	scene11_swingerScreenEdge = 0;
+	scene11_swingieScreenEdge = 0;
 	scene11_crySound = 0;
 	scene11_swingAngle = 1.0;
 	scene11_swingOldAngle = 1.0;
 	scene11_swingSpeed = 1.0;
 	scene11_swingAngleDiff = 1.0;
 	scene11_swingInertia = 0.0;
-	scene11_var13 = 0;
-	scene11_var14 = 0;
-	scene11_var15 = 0;
-	scene11_var16 = 0;
-	scene11_var17 = 0;
-	scene11_var18 = 0;
-	scene11_var19 = 0;
-	scene11_var20 = 0;
-	scene11_var21 = 0;
-	scene11_var22 = 0;
-	scene11_var23 = 45;
+	scene11_swingCounter = 0;
+	scene11_swingCounterPrevTurn = 0;
+	scene11_swingDirection = 0;
+	scene11_swingDirectionPrevTurn = 0;
+	scene11_swingIsSwinging = false;
+	scene11_swingieStands = false;
+	scene11_dudeX = 0;
+	scene11_dudeY = 0;
+	scene11_swingMaxAngle = 45;
 
 	scene12_fly = 0;
 	scene12_flyCountdown = 0;

diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
@@ -231,27 +231,25 @@ class Vars {
 	PictureObject *scene11_hint;
 	MGM scene11_mgm;
 	bool scene11_arcadeIsOn;
-	bool scene11_var03;
-	bool scene11_var04;
+	bool scene11_scrollIsEnabled;
+	bool scene11_scrollIsMaximized;
 	int scene11_hintCounter;
-	int scene11_swingerScreenEdge;
+	int scene11_swingieScreenEdge;
 	int scene11_crySound;
 	double scene11_swingAngle;
 	double scene11_swingOldAngle;
 	double scene11_swingSpeed;
 	double scene11_swingAngleDiff;
 	double scene11_swingInertia;
-	int scene11_var13;
-	int scene11_var14;
-	int scene11_var15;
-	int scene11_var16;
-	int scene11_var17;
-	int scene11_var18;
-	int scene11_var19;
-	int scene11_var20;
-	int scene11_var21;
-	int scene11_var22;
-	int scene11_var23;
+	int scene11_swingCounter;
+	int scene11_swingCounterPrevTurn;
+	int scene11_swingDirection;
+	int scene11_swingDirectionPrevTurn;
+	bool scene11_swingIsSwinging;
+	bool scene11_swingieStands;
+	int scene11_dudeX;
+	int scene11_dudeY;
+	int scene11_swingMaxAngle;
 
 	int scene12_fly;
 	int scene12_flyCountdown;