[Scummvm-cvs-logs] scummvm master -> a08624c791ccc73a9d75eceaa2e7ff19ccac0158

sev- sev at scummvm.org
Sun Mar 30 15:19:15 CEST 2014


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

Summary:
a08624c791 FULLPIPE: Implement sceneHandler29_sub16()


Commit: a08624c791ccc73a9d75eceaa2e7ff19ccac0158
    https://github.com/scummvm/scummvm/commit/a08624c791ccc73a9d75eceaa2e7ff19ccac0158
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-03-30T16:18:22+03:00

Commit Message:
FULLPIPE: Implement sceneHandler29_sub16()

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



diff --git a/engines/fullpipe/scenes/scene29.cpp b/engines/fullpipe/scenes/scene29.cpp
index 9e63ee8..13da04d 100644
--- a/engines/fullpipe/scenes/scene29.cpp
+++ b/engines/fullpipe/scenes/scene29.cpp
@@ -231,6 +231,40 @@ bool sceneHandler29_sub15(StaticANIObject *ani, int maxx) {
 		return true;
 }
 
+bool sceneHandler29_sub16(StaticANIObject *ani, int maxx) {
+	if (!g_vars->scene29_var10 || g_vars->scene29_var15)
+		return false;
+
+	if (ani->_ox >= g_vars->scene29_var20 + 40) {
+		if (maxx > g_vars->scene29_var20 + 27)
+			return false;
+	} else {
+		if (ani->_ox <= g_vars->scene29_var20 + 10) {
+			if (ani->_ox < g_vars->scene29_var20 + 40)
+				return false;
+
+			if (maxx > g_vars->scene29_var20 + 27)
+				return false;
+		}
+	}
+
+	if (!g_fp->_aniMan->_movement)
+		return true;
+
+	if (g_fp->_aniMan->_movement->_id == MV_MAN29_JUMP)
+		return true;
+
+	if (g_fp->_aniMan->_movement->_id == MV_MAN29_RUN)
+		return true;
+
+	if (g_fp->_aniMan->_movement->_id == MV_MAN29_BEND) {
+		if (g_fp->_aniMan->_movement->_currDynamicPhaseIndex < 1 || g_fp->_aniMan->_movement->_currDynamicPhaseIndex > 5)
+			return true;
+	}
+
+	return false;
+}
+
 void sceneHandler29_sub03() {
 	warning("STUB: sceneHandler29_sub03()");
 }






More information about the Scummvm-git-logs mailing list