[Scummvm-cvs-logs] scummvm master -> 6673472a2266373a96959c741dc922b40e975179

sev- sev at scummvm.org
Sun Feb 23 22:45:36 CET 2014


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

Summary:
5e8559e23f FULLPIPE: Started renaming in scene09
6673472a22 FULLPIPE: More renames in scene09


Commit: 5e8559e23ff8d1979ca216938b3aa29426f5c94a
    https://github.com/scummvm/scummvm/commit/5e8559e23ff8d1979ca216938b3aa29426f5c94a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-23T13:45:12-08:00

Commit Message:
FULLPIPE: Started renaming 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 6fd3989..c8c69b4 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -157,12 +157,12 @@ Vars::Vars() {
 	scene08_manOffsetY = 0;
 
 	scene09_flyingBall = 0;
-	scene09_var05 = 0;
-	scene09_glotatel = 0;
+	scene09_numSwallenBalls = 0;
+	scene09_gulper = 0;
 	scene09_spitter = 0;
 	scene09_grit = 0;
-	scene09_var02 = 0;
-	scene09_var08 = 1;
+	scene09_dudeY = 0;
+	scene09_gulperIsPresent = true;
 	scene09_var09 = 0;
 	scene09_var10 = -1;
 	scene09_var11 = -1;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 32dfb96..7211a61 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -348,13 +348,13 @@ public:
 	bool scene08_stairsVisible;
 	int scene08_manOffsetY;
 
-	int scene09_var02;
+	int scene09_dudeY;
 	StaticANIObject *scene09_flyingBall;
-	int scene09_var05;
-	StaticANIObject *scene09_glotatel;
+	int scene09_numSwallenBalls;
+	StaticANIObject *scene09_gulper;
 	StaticANIObject *scene09_spitter;
 	StaticANIObject *scene09_grit;
-	int scene09_var08;
+	bool scene09_gulperIsPresent;
 	int scene09_var09;
 	int scene09_var10;
 	int scene09_var11;
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index 9bff577..39fc649 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -59,11 +59,11 @@ void scene09_setupGrit(Scene *sc) {
 
 void scene09_initScene(Scene *sc) {
 	g_vars->scene09_flyingBall = 0;
-	g_vars->scene09_var05 = 0;
-	g_vars->scene09_glotatel = sc->getStaticANIObject1ById(ANI_GLOTATEL, -1);
+	g_vars->scene09_numSwallenBalls = 0;
+	g_vars->scene09_gulper = sc->getStaticANIObject1ById(ANI_GLOTATEL, -1);
 	g_vars->scene09_spitter = sc->getStaticANIObject1ById(ANI_PLEVATEL, -1);
 	g_vars->scene09_grit = sc->getStaticANIObject1ById(ANI_GRIT_9, -1);
-	g_vars->scene09_var08 = 1;
+	g_vars->scene09_gulperIsPresent = true;
 	g_vars->scene09_var09 = 0;
 	g_vars->scene09_var10 = -1;
 	g_vars->scene09_var11 = -1;
@@ -232,7 +232,7 @@ int scene09_updateCursor() {
 				g_fp->_updateScreenCallback = sceneHandler09_updateScreenCallback;
 		} else {
 			if (g_fp->_objectIdAtCursor == PIC_SC9_LADDER_R && g_fp->_cursorId == PIC_CSR_ITN)
-				g_fp->_cursorId = (g_vars->scene09_var02 < 350) ? PIC_CSR_GOD : PIC_CSR_GOU;
+				g_fp->_cursorId = (g_vars->scene09_dudeY < 350) ? PIC_CSR_GOD : PIC_CSR_GOU;
 		}
 	} else {
 		g_fp->_cursorId = PIC_CSR_ITN;
@@ -242,14 +242,14 @@ int scene09_updateCursor() {
 }
 
 void sceneHandler09_winArcade() {
-	if (g_vars->scene09_glotatel->_flags & 4) {
-		g_vars->scene09_glotatel->changeStatics2(ST_GLT_SIT);
-		g_vars->scene09_glotatel->startAnim(MV_GLT_FLYAWAY, 0, -1);
+	if (g_vars->scene09_gulper->_flags & 4) {
+		g_vars->scene09_gulper->changeStatics2(ST_GLT_SIT);
+		g_vars->scene09_gulper->startAnim(MV_GLT_FLYAWAY, 0, -1);
 
 		g_fp->setObjectState(sO_Jug, g_fp->getObjectEnumState(sO_Jug, sO_Unblocked));
 		g_fp->setObjectState(sO_RightStairs_9, g_fp->getObjectEnumState(sO_RightStairs_9, sO_IsOpened));
 
-		g_vars->scene09_var08 = 0;
+		g_vars->scene09_gulperIsPresent = false;
 	}
 }
 
@@ -343,10 +343,10 @@ void sceneHandler09_eatBall() {
 		g_vars->scene09_var07.field_8 = ball;
 
 		g_vars->scene09_flyingBall = 0;
-		g_vars->scene09_var05++;
+		g_vars->scene09_numSwallenBalls++;
 
-		if (g_vars->scene09_var05 >= 3) {
-			MessageQueue *mq = g_vars->scene09_glotatel->getMessageQueue();
+		if (g_vars->scene09_numSwallenBalls >= 3) {
+			MessageQueue *mq = g_vars->scene09_gulper->getMessageQueue();
 
 			if (mq) {
 				ExCommand *ex = new ExCommand(ANI_GLOTATEL, 1, MV_GLT_FLYAWAY, 0, 0, 0, 1, 0, 0, 0);
@@ -358,7 +358,7 @@ void sceneHandler09_eatBall() {
 			g_fp->setObjectState(sO_Jug, g_fp->getObjectEnumState(sO_Jug, sO_Unblocked));
 			g_fp->setObjectState(sO_RightStairs_9, g_fp->getObjectEnumState(sO_RightStairs_9, sO_IsOpened));
 
-			g_vars->scene09_var08 = 0;
+			g_vars->scene09_gulperIsPresent = false;
 		}
 	}
 }
@@ -447,17 +447,17 @@ void sceneHandler09_limitHangerPhase() {
 }
 
 void sceneHandler09_collideBall(Ball *ball) {
-	if (g_vars->scene09_var08) {
+	if (g_vars->scene09_gulperIsPresent) {
 		g_vars->scene09_flyingBall = ball->ani;
 
-		if (g_vars->scene09_glotatel) {
-			g_vars->scene09_glotatel->changeStatics2(ST_GLT_SIT);
+		if (g_vars->scene09_gulper) {
+			g_vars->scene09_gulper->changeStatics2(ST_GLT_SIT);
 
 			MessageQueue *mq = new MessageQueue(g_fp->_currentScene->getMessageQueueById(QU_SC9_EATBALL), 0, 0);
 
 			mq->setFlags(mq->getFlags() | 1);
 
-			if (!mq->chain(g_vars->scene09_glotatel))
+			if (!mq->chain(g_vars->scene09_gulper))
 				delete mq;
 		}
 	}
@@ -541,9 +541,9 @@ void sceneHandler09_checkHangerCollide() {
 		ball->ani->setOXY(newx, ball->ani->_oy);
 
 		if (newx <= 1398 || g_vars->scene09_flyingBall) {
-			if (g_vars->scene09_var08)
+			if (g_vars->scene09_gulperIsPresent)
 				goto LABEL_11;
-		} else if (g_vars->scene09_var08) {
+		} else if (g_vars->scene09_gulperIsPresent) {
 			sceneHandler09_collideBall(ball);
 			continue;
 		}
@@ -623,7 +623,7 @@ int sceneHandler09(ExCommand *cmd) {
 		break;
 
 	case MSG_SC9_FLOWN:
-		g_vars->scene09_var08 = 0;
+		g_vars->scene09_gulperIsPresent = false;
 		break;
 
 	case MSG_SC9_EATBALL:
@@ -641,7 +641,7 @@ int sceneHandler09(ExCommand *cmd) {
 			if (g_fp->_aniMan2) {
 				int x = g_fp->_aniMan2->_ox;
 
-				g_vars->scene09_var02 = g_fp->_aniMan2->_oy;
+				g_vars->scene09_dudeY = g_fp->_aniMan2->_oy;
 
 				if (x < g_fp->_sceneRect.left + 200)
 					g_fp->_currentScene->_x = x - g_fp->_sceneRect.left - 300;


Commit: 6673472a2266373a96959c741dc922b40e975179
    https://github.com/scummvm/scummvm/commit/6673472a2266373a96959c741dc922b40e975179
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-23T13:45:12-08:00

Commit Message:
FULLPIPE: More 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 c8c69b4..1c82110 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -163,8 +163,8 @@ Vars::Vars() {
 	scene09_grit = 0;
 	scene09_dudeY = 0;
 	scene09_gulperIsPresent = true;
-	scene09_var09 = 0;
-	scene09_var10 = -1;
+	scene09_dudeIsOnLadder = false;
+	scene09_interactingHanger = -1;
 	scene09_var11 = -1;
 	scene09_var12 = -1000;
 	scene09_numMovingHangers = 0;
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 7211a61..8b82101 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -355,8 +355,8 @@ public:
 	StaticANIObject *scene09_spitter;
 	StaticANIObject *scene09_grit;
 	bool scene09_gulperIsPresent;
-	int scene09_var09;
-	int scene09_var10;
+	bool scene09_dudeIsOnLadder;
+	int scene09_interactingHanger;
 	int scene09_var11;
 	int scene09_var12;
 	BallChain scene09_balls;
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index 39fc649..dcd6b83 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -64,8 +64,8 @@ void scene09_initScene(Scene *sc) {
 	g_vars->scene09_spitter = sc->getStaticANIObject1ById(ANI_PLEVATEL, -1);
 	g_vars->scene09_grit = sc->getStaticANIObject1ById(ANI_GRIT_9, -1);
 	g_vars->scene09_gulperIsPresent = true;
-	g_vars->scene09_var09 = 0;
-	g_vars->scene09_var10 = -1;
+	g_vars->scene09_dudeIsOnLadder = false;
+	g_vars->scene09_interactingHanger = -1;
 	g_vars->scene09_var11 = -1;
 	g_vars->scene09_var12 = -1000;
 
@@ -215,7 +215,7 @@ void scene09_initScene(Scene *sc) {
 }
 
 int sceneHandler09_updateScreenCallback() {
-	int res = g_fp->drawArcadeOverlay(g_fp->_objectIdAtCursor == ANI_VISUNCHIK || g_vars->scene09_var10 >= 0);
+	int res = g_fp->drawArcadeOverlay(g_fp->_objectIdAtCursor == ANI_VISUNCHIK || g_vars->scene09_interactingHanger >= 0);
 
 	if (!res)
 		g_fp->_updateScreenCallback = 0;
@@ -226,7 +226,7 @@ int sceneHandler09_updateScreenCallback() {
 int scene09_updateCursor() {
 	g_fp->updateCursorCommon();
 
-	if (g_vars->scene09_var10 < 0) {
+	if (g_vars->scene09_interactingHanger < 0) {
 		if (g_fp->_objectIdAtCursor == ANI_VISUNCHIK) {
 			if (g_fp->_cursorId == PIC_CSR_ITN)
 				g_fp->_updateScreenCallback = sceneHandler09_updateScreenCallback;
@@ -428,7 +428,7 @@ void sceneHandler09_cycleHangers() {
 
 void sceneHandler09_limitHangerPhase() {
 	for (int i = 0; i < g_vars->scene09_numMovingHangers; i++) {
-		if (i != g_vars->scene09_var10) {
+		if (i != g_vars->scene09_interactingHanger) {
 			g_vars->scene09_hangers[i]->phase += g_vars->scene09_hangers[i]->field_8;
 
 			if (g_vars->scene09_hangers[i]->phase > 85)
@@ -570,14 +570,14 @@ void sceneHandler09_checkHangerCollide() {
 }
 
 void sceneHandler09_hangerStartCycle() {
-	StaticANIObject *ani = g_vars->scene09_hangers[g_vars->scene09_var10]->ani;
+	StaticANIObject *ani = g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->ani;
 
 	if (ani->_movement) {
 		ani->startAnim(MV_VSN_CYCLE2, 0, -1);
-		g_vars->scene09_hangers[g_vars->scene09_var10]->field_8 = 0;
-		g_vars->scene09_hangers[g_vars->scene09_var10]->phase = g_vars->scene09_var11 + (g_fp->_mouseScreenPos.y - g_vars->scene09_var19) / 2;
+		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;
 
-		if (g_vars->scene09_var12 != -1000 && g_vars->scene09_hangers[g_vars->scene09_var10]->phase != g_vars->scene09_var12) {
+		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);
 
 			ex->_field_14 = 1;
@@ -587,7 +587,7 @@ void sceneHandler09_hangerStartCycle() {
 			g_vars->scene09_var12 = -1000;
 		}
 	} else {
-		g_vars->scene09_var10 = -1;
+		g_vars->scene09_interactingHanger = -1;
 	}
 }
 
@@ -608,14 +608,14 @@ int sceneHandler09(ExCommand *cmd) {
 		getCurrSceneSc2MotionController()->setEnabled();
 		getGameLoaderInteractionController()->enableFlag24();
 
-		g_vars->scene09_var09 = 0;
+		g_vars->scene09_dudeIsOnLadder = false;
 		break;
 
 	case MSG_SC9_TOLADDER:
 		getCurrSceneSc2MotionController()->clearEnabled();
 		getGameLoaderInteractionController()->disableFlag24();
 
-		g_vars->scene09_var09 = 1;
+		g_vars->scene09_dudeIsOnLadder = true;
 		break;
 
 	case MSG_SC9_PLVCLICK:
@@ -659,7 +659,7 @@ int sceneHandler09(ExCommand *cmd) {
 			sceneHandler09_limitHangerPhase();
 			sceneHandler09_checkHangerCollide();
 
-			if (g_vars->scene09_var10 >= 0)
+			if (g_vars->scene09_interactingHanger >= 0)
 				sceneHandler09_hangerStartCycle();
 
 			if (!g_vars->scene09_var17)
@@ -671,14 +671,14 @@ int sceneHandler09(ExCommand *cmd) {
 		}
 
 	case 30:
-		if (g_vars->scene09_var10 >= 0)  {
-			if (ABS(g_vars->scene09_hangers[g_vars->scene09_var10]->phase) < 15) {
-				g_vars->scene09_hangers[g_vars->scene09_var10]->ani->_callback2 = 0;
-				g_vars->scene09_hangers[g_vars->scene09_var10]->ani->changeStatics2(ST_VSN_NORMAL);
+		if (g_vars->scene09_interactingHanger >= 0)  {
+			if (ABS(g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->phase) < 15) {
+				g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->ani->_callback2 = 0;
+				g_vars->scene09_hangers[g_vars->scene09_interactingHanger]->ani->changeStatics2(ST_VSN_NORMAL);
 			}
 		}
 
-		g_vars->scene09_var10 = -1;
+		g_vars->scene09_interactingHanger = -1;
 
 		break;
 
@@ -703,7 +703,7 @@ int sceneHandler09(ExCommand *cmd) {
 								break;
 						}
 
-						g_vars->scene09_var10 = hng;
+						g_vars->scene09_interactingHanger = hng;
 						g_vars->scene09_var11 = g_vars->scene09_hangers[hng]->phase;
 						g_vars->scene09_var12 = g_vars->scene09_hangers[hng]->phase;
 
@@ -726,7 +726,7 @@ int sceneHandler09(ExCommand *cmd) {
 				}
 			}
 
-			if (g_vars->scene09_var09 && g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY) == PIC_SC9_LADDER_R
+			if (g_vars->scene09_dudeIsOnLadder && g_fp->_currentScene->getPictureObjectIdAtPos(cmd->_sceneClickX, cmd->_sceneClickY) == PIC_SC9_LADDER_R
 				&& !cmd->_keyCode && !g_fp->_aniMan->_movement) {
 				handleObjectInteraction(g_fp->_aniMan, g_fp->_currentScene->getPictureObjectById(PIC_SC9_LADDER_R, 0), 0);
 			}






More information about the Scummvm-git-logs mailing list