[Scummvm-cvs-logs] scummvm master -> 4332d9263b5ad7639c2f7644038d1476c07dfc0d

[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:
7a3dd1dbbf FULLPIPE: Implement sceneHandler29_sub07()
4332d9263b FULLPIPE: Implement sceneHandler29_sub15()


Commit: 7a3dd1dbbf5a34ad2b9edbfbe680ec09dd7ab734
    https://github.com/scummvm/scummvm/commit/7a3dd1dbbf5a34ad2b9edbfbe680ec09dd7ab734
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-29T23:40:48+02:00

Commit Message:
FULLPIPE: Implement sceneHandler29_sub07()

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



diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 27fc09a..556e04b 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -357,7 +357,9 @@ void sceneHandler29_shootersEscape() {
 }
 
 void sceneHandler29_sub07() {
-	warning("STUB: sceneHandler29_sub07()");
+	g_vars->scene29_var20 -= 2;
+  
+	g_fp->_aniMan->setOXY(g_vars->scene29_var20, g_vars->scene29_var21);
 }
 
 void sceneHandler29_assHitGreen() {


Commit: 4332d9263b5ad7639c2f7644038d1476c07dfc0d
    https://github.com/scummvm/scummvm/commit/4332d9263b5ad7639c2f7644038d1476c07dfc0d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-29T23:47:27+02:00

Commit Message:
FULLPIPE: Implement sceneHandler29_sub15()

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



diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 556e04b..9e63ee8 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -211,6 +211,26 @@ void sceneHandler29_manBend() {
 	g_vars->scene29_var21 = g_fp->_aniMan->_oy;
 }
 
+bool sceneHandler29_sub15(StaticANIObject *ani, int maxx) {
+	if (!g_vars->scene29_var10 || g_vars->scene29_var15)
+		return false;
+
+	if ((ani->_ox >= g_vars->scene29_var20 + 42 || ani->_ox <= g_vars->scene29_var20 + 8)
+		&& (ani->_ox < g_vars->scene29_var20 + 8 || maxx > g_vars->scene29_var20 + 27))
+		return false;
+
+	if (!g_fp->_aniMan->_movement)
+		return true;
+
+	int phase = g_fp->_aniMan->_movement->_currDynamicPhaseIndex;
+
+	if (g_fp->_aniMan->_movement->_id != MV_MAN29_BEND && g_fp->_aniMan->_movement->_id != MV_MAN29_RUN
+		&& (g_fp->_aniMan->_movement->_id != MV_MAN29_JUMP || (phase >= 3 && phase <= 6)))
+		return false;
+	else
+		return true;
+}
+
 void sceneHandler29_sub03() {
 	warning("STUB: sceneHandler29_sub03()");
 }