FULLPIPE: Fix code formatting

scummvm · Oct 2, 2016 · c141bae · c141bae
1 parent 405c4e0
commit c141bae
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
@@ -306,7 +306,7 @@ void sceneHandler14_endArcade() {
 void sceneHandler14_winArcade() {
 	if (g_vars->scene14_arcadeIsOn) {
 		if (g_vars->scene14_dudeIsKicking) {
-			g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+			g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
 
 			g_vars->scene14_dudeIsKicking = false;
 		}
@@ -424,7 +424,7 @@ void sceneHandler14_dudeDecline() {
 	g_vars->scene14_mouseCursorPos.y = g_fp->_mouseVirtY;
 
 	g_fp->_aniMan->_callback2 = sceneHandler14_declineCallback;
-	g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+	g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
 	g_fp->_aniMan->startAnim(MV_MAN14_DECLINE, 0, -1);
 
 	g_vars->scene14_dudeIsKicking = true;
@@ -547,7 +547,7 @@ void sceneHandler14_dudeFall() {
 	if (!g_fp->_aniMan->_movement || g_fp->_aniMan->_movement->_id != MV_MAN14_FALL) {
 		sceneHandler14_clearCallback();
 
-		g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+		g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
 		g_fp->_aniMan->startAnim(MV_MAN14_FALL, 0, -1);
 		g_vars->scene14_flyingBall->stopAnim_maybe();
 		g_vars->scene14_flyingBall->hide();
@@ -558,7 +558,7 @@ void sceneHandler14_dudeFall() {
 }
 
 void sceneHandler14_grandmaStepForward() {
-	g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT|0x4000);
+	g_fp->_aniMan->changeStatics2(ST_MAN_RIGHT | 0x4000);
 	g_fp->_aniMan->startAnim(MV_MAN14_STEPFW, 0, -1);
 
 	g_vars->scene14_dude2X -= 71;
@@ -622,14 +622,18 @@ void sceneHandler14_arcadeLogic() {
 }
 
 void sceneHandler14_animateBall() {
-	int x = g_vars->scene14_ballX += g_vars->scene14_ballDeltaX;
-	int y = g_vars->scene14_ballY += g_vars->scene14_ballDeltaY;
+	g_vars->scene14_ballX += g_vars->scene14_ballDeltaX;
+	g_vars->scene14_ballY += g_vars->scene14_ballDeltaY;
+
+	int x = g_vars->scene14_ballX;
+	int y = g_vars->scene14_ballY;
 
 	g_vars->scene14_ballDeltaY++;
 
 	if (g_vars->scene14_ballY <= 517) {
-		if (x <= g_vars->scene14_dudeX - 16 ) {
-			if ( g_vars->scene14_ballDeltaX >= 0 || x >= g_vars->scene14_grandmaX + 65 || x <= g_vars->scene14_grandmaX - 135 || y <= g_vars->scene14_grandmaY - 102 ) {
+		if (x <= g_vars->scene14_dudeX - 16) {
+			if (g_vars->scene14_ballDeltaX >= 0 || x >= g_vars->scene14_grandmaX + 65
+					|| x <= g_vars->scene14_grandmaX - 135 || y <= g_vars->scene14_grandmaY - 102) {
 				if (g_vars->scene14_flyingBall->_movement)
 					g_vars->scene14_flyingBall->_movement->setOXY(x, y);
 				else
@@ -827,7 +831,7 @@ int sceneHandler14(ExCommand *cmd) {
 
 				if (!pic || !canInteractAny(g_fp->_aniMan, pic, cmd->_param)) {
 					if ((g_fp->_sceneRect.right - cmd->_sceneClickX < 47 && g_fp->_sceneRect.right < g_fp->_sceneWidth - 1)
-						|| (cmd->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0)) {
+							|| (cmd->_sceneClickX - g_fp->_sceneRect.left < 47 && g_fp->_sceneRect.left > 0)) {
 						g_fp->processArcade(cmd);
 						sceneHandler14_arcadeProcessClick(cmd);
 						break;