[Scummvm-git-logs] scummvm master -> b624e4e7b75763c35c7bb0c8df00eb6845553475

[sev-]

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:
5e814b6d36 FULLPIPE: Scene26: Fix pool level validation
b624e4e7b7 FULLPIPE: Scene14: Fix ball game


Commit: 5e814b6d36edc1e84ea47b79a181120b799a119f
    https://github.com/scummvm/scummvm/commit/5e814b6d36edc1e84ea47b79a181120b799a119f
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-10-01T20:28:45+02:00

Commit Message:
FULLPIPE: Scene26: Fix pool level validation

Changed paths:
    engines/fullpipe/scenes/scene26.cpp



diff --git a/engines/fullpipe/scenes/scene26.cpp b/engines/fullpipe/scenes/scene26.cpp
index e36d907..9706bd5 100644
--- a/engines/fullpipe/scenes/scene26.cpp
+++ b/engines/fullpipe/scenes/scene26.cpp
@@ -94,17 +94,17 @@ void sceneHandler26_showChi() {
 }
 
 void sceneHandler26_updatePool() {
-	if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Valve1_26))
+	if (g_fp->getObjectState(sO_Valve1_26) == g_fp->getObjectEnumState(sO_Valve1_26, sO_Opened))
 		g_fp->setObjectState(sO_Pool, g_fp->getObjectEnumState(sO_Pool, sO_Overfull));
 	else if (g_fp->getObjectState(sO_Pool) == g_fp->getObjectEnumState(sO_Pool, sO_Overfull))
 		g_fp->setObjectState(sO_Pool, g_fp->getObjectEnumState(sO_Pool, sO_Full));
 
-	if (g_fp->getObjectState(sO_Valve2_26) == g_fp->getObjectEnumState(sO_Valve2_26, sO_Valve1_26)) {
+	if (g_fp->getObjectState(sO_Valve2_26) == g_fp->getObjectEnumState(sO_Valve2_26, sO_Opened)) {
 		if (g_fp->getObjectState(sO_Pool) >= g_fp->getObjectEnumState(sO_Pool, sO_Full))
 			g_fp->setObjectState(sO_Pool, g_fp->getObjectEnumState(sO_Pool, sO_HalfFull));
 	}
 
-	if (g_fp->getObjectState(sO_Valve3_26) == g_fp->getObjectEnumState(sO_Valve3_26, sO_Valve1_26)) {
+	if (g_fp->getObjectState(sO_Valve3_26) == g_fp->getObjectEnumState(sO_Valve3_26, sO_Opened)) {
 		if (g_fp->getObjectState(sO_Pool) >= g_fp->getObjectEnumState(sO_Pool, sO_HalfFull))
 			g_fp->setObjectState(sO_Pool, g_fp->getObjectEnumState(sO_Pool, sO_Empty));
 	}


Commit: b624e4e7b75763c35c7bb0c8df00eb6845553475
    https://github.com/scummvm/scummvm/commit/b624e4e7b75763c35c7bb0c8df00eb6845553475
Author: Retro-Junk (bambarbee at yandex.ru)
Date: 2016-10-01T20:28:54+02:00

Commit Message:
FULLPIPE: Scene14: Fix ball game

Changed paths:
    engines/fullpipe/scenes/scene14.cpp



diff --git a/engines/fullpipe/scenes/scene14.cpp b/engines/fullpipe/scenes/scene14.cpp
index f6841a8..8fd95b7 100644
--- a/engines/fullpipe/scenes/scene14.cpp
+++ b/engines/fullpipe/scenes/scene14.cpp
@@ -622,15 +622,12 @@ void sceneHandler14_arcadeLogic() {
 }
 
 void sceneHandler14_animateBall() {
-	int x = g_vars->scene14_ballDeltaX + g_vars->scene14_ballX;
-	int y = g_vars->scene14_ballDeltaY + g_vars->scene14_ballY;
-
-	g_vars->scene14_ballX += g_vars->scene14_ballDeltaX;
-	g_vars->scene14_ballY += g_vars->scene14_ballDeltaY;
+	int x = g_vars->scene14_ballX += g_vars->scene14_ballDeltaX;
+	int y = g_vars->scene14_ballY += g_vars->scene14_ballDeltaY;
 
 	g_vars->scene14_ballDeltaY++;
 
-	if (g_vars->scene14_ballDeltaY - 1 + g_vars->scene14_ballY > 517) {
+	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 (g_vars->scene14_flyingBall->_movement)