[Scummvm-cvs-logs] scummvm master -> eb4d2695ee7df2b8591f30efa2759cac1f57fcd9
sev-
sev at scummvm.org
Tue Feb 18 19:53:09 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:
c998e83eb3 FULLPIPE: Implement sceneHandler09_cycleHangers()
eb4d2695ee FULLPIPE: Implement sceneHandler09_limitHangerPhase()
Commit: c998e83eb316a8841847e4c80a8d308f51f3d0fe
https://github.com/scummvm/scummvm/commit/c998e83eb316a8841847e4c80a8d308f51f3d0fe
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-18T10:52:16-08:00
Commit Message:
FULLPIPE: Implement sceneHandler09_cycleHangers()
Changed paths:
engines/fullpipe/scenes/scene09.cpp
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index 7666e87..1ad151a 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -309,7 +309,26 @@ void sceneHandler09_showBall() {
}
void sceneHandler09_cycleHangers() {
- warning("STUB: sceneHandler09_cycleHangers()");
+ for (int i = 0; i < g_vars->scene09_numMovingHangers; i++) {
+ Movement *mov = g_vars->scene09_hangers[i]->ani->_movement;
+
+ if (mov && mov->_id == MV_VSN_CYCLE2) {
+ int idx;
+
+ if (g_vars->scene09_hangers[i]->phase >= 0)
+ idx = 18 - g_vars->scene09_hangers[i]->phase / 5;
+ else
+ idx = 18 - g_vars->scene09_hangers[i]->phase * 10 / 43;
+
+ if (idx > 38)
+ idx = 38;
+
+ if (idx < 1)
+ idx = 1;
+
+ mov->setDynamicPhaseIndex(idx);
+ }
+ }
}
void sceneHandler09_limitHangerPhase() {
Commit: eb4d2695ee7df2b8591f30efa2759cac1f57fcd9
https://github.com/scummvm/scummvm/commit/eb4d2695ee7df2b8591f30efa2759cac1f57fcd9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2014-02-18T10:56:37-08:00
Commit Message:
FULLPIPE: Implement sceneHandler09_limitHangerPhase()
Changed paths:
engines/fullpipe/scenes/scene09.cpp
diff --git a/engines/fullpipe/scenes/scene09.cpp b/engines/fullpipe/scenes/scene09.cpp
index 1ad151a..3762a43 100644
--- a/engines/fullpipe/scenes/scene09.cpp
+++ b/engines/fullpipe/scenes/scene09.cpp
@@ -332,7 +332,23 @@ void sceneHandler09_cycleHangers() {
}
void sceneHandler09_limitHangerPhase() {
- warning("STUB: sceneHandler09_limitHangerPhase()");
+ for (int i = 0; i < g_vars->scene09_numMovingHangers; i++) {
+ if (i != g_vars_scene09_var10) {
+ g_vars_scene09_hangers[i]->phase += g_vars_scene09_hangers[i]->field_8;
+
+ if (g_vars_scene09_hangers[i]->phase > 85)
+ g_vars_scene09_hangers[i]->phase = 85;
+
+ if (g_vars_scene09_hangers[i]->phase < -85)
+ g_vars_scene09_hangers[i]->phase = -85;
+
+ if (g_vars_scene09_hangers[i]->phase < 0)
+ g_vars_scene09_hangers[i]->field_8++;
+
+ if (g_vars_scene09_hangers[i]->phase > 0)
+ g_vars_scene09_hangers[i]->field_8--;
+ }
+ }
}
void sceneHandler09_collideBall(Ball *ball) {
More information about the Scummvm-git-logs
mailing list