[Scummvm-cvs-logs] scummvm master -> 73d7a7c14b3bd98523f13f739ae7b0780ee95f37
sev-
sev at scummvm.org
Sun Dec 15 20:52:34 CET 2013
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:
ab688e15a2 FULLPIPE: Renames in scene05
73d7a7c14b FULLPIPE: Implement sceneHandler05_genFlies(). This completes the scene
Commit: ab688e15a2709eacca3ab989e69c81370199dad3
https://github.com/scummvm/scummvm/commit/ab688e15a2709eacca3ab989e69c81370199dad3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-15T11:51:53-08:00
Commit Message:
FULLPIPE: Renames in scene05
Changed paths:
engines/fullpipe/scenes.cpp
engines/fullpipe/scenes.h
engines/fullpipe/scenes/scene05.cpp
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp
index a36b30a..41bec4d 100644
--- a/engines/fullpipe/scenes.cpp
+++ b/engines/fullpipe/scenes.cpp
@@ -106,9 +106,9 @@ Vars::Vars() {
scene05_handle = 0;
scene05_wacko = 0;
scene05_bigHatch = 0;
- scene05_var01 = 0;
- scene05_var02 = 0;
- scene05_var03 = 0;
+ scene05_wackoTicker = 0;
+ scene05_handleFlipper = 0;
+ scene05_floatersTicker = 0;
selector = 0;
}
diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h
index 4645d8b..4c7302d 100644
--- a/engines/fullpipe/scenes.h
+++ b/engines/fullpipe/scenes.h
@@ -137,9 +137,9 @@ public:
StaticANIObject *scene05_handle;
StaticANIObject *scene05_wacko;
StaticANIObject *scene05_bigHatch;
- int scene05_var01;
- int scene05_var02;
- int scene05_var03;
+ int scene05_wackoTicker;
+ int scene05_handleFlipper;
+ int scene05_floatersTicker;
PictureObject *selector;
};
diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp
index f050913..00861d9 100644
--- a/engines/fullpipe/scenes/scene05.cpp
+++ b/engines/fullpipe/scenes/scene05.cpp
@@ -40,9 +40,9 @@ void scene05_initScene(Scene *sc) {
g_vars->scene05_bigHatch = sc->getStaticANIObject1ById(ANI_BIGLUK, -1);
- g_vars->scene05_var01 = 0;
- g_vars->scene05_var02 = 1;
- g_vars->scene05_var03 = 1000;
+ g_vars->scene05_wackoTicker = 0;
+ g_vars->scene05_handleFlipper = 1;
+ g_vars->scene05_floatersTicker = 1000;
Scene *oldscene = g_fullpipe->_currentScene;
@@ -124,9 +124,9 @@ void sceneHandler05_makeWackoFeedback() {
void sceneHandler05_resetTicks() {
if (g_fullpipe->_aniMan->_movement && (g_fullpipe->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP
|| g_fullpipe->_aniMan->_movement->_id == MV_MANHDL_HANDLEDOWN))
- g_vars->scene05_var01 = g_fullpipe->_updateTicks;
+ g_vars->scene05_wackoTicker = g_fullpipe->_updateTicks;
else
- g_vars->scene05_var01 = 0;
+ g_vars->scene05_wackoTicker = 0;
}
void sceneHandler05_genFlies() {
@@ -297,7 +297,7 @@ int sceneHandler05(ExCommand *ex) {
if (!g_fullpipe->_aniMan->_movement || (g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP
&& g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) {
sceneHandler05_makeWackoFeedback();
- g_vars->scene05_var01 = 0;
+ g_vars->scene05_wackoTicker = 0;
}
break;
@@ -336,21 +336,22 @@ int sceneHandler05(ExCommand *ex) {
res = 1;
}
- if (g_vars->scene05_var01) {
- if ((g_fullpipe->_updateTicks - g_vars->scene05_var01) > 62) {
+ if (g_vars->scene05_wackoTicker) {
+ if ((g_fullpipe->_updateTicks - g_vars->scene05_wackoTicker) > 62) {
if (!g_fullpipe->_aniMan->_movement || (g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP
&& g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) {
- if (g_vars->scene05_var02 % 2)
+ if (g_vars->scene05_handleFlipper % 2)
sceneHandler05_makeWackoFeedback();
- g_vars->scene05_var01 = 0;
+ g_vars->scene05_wackoTicker = 0;
- ++g_vars->scene05_var02;
+ ++g_vars->scene05_handleFlipper;
}
}
}
- ++g_vars->scene05_var03;
+ ++g_vars->scene05_floatersTicker;
+
g_fullpipe->_floaters->update();
g_fullpipe->_behaviorManager->updateBehaviors();
Commit: 73d7a7c14b3bd98523f13f739ae7b0780ee95f37
https://github.com/scummvm/scummvm/commit/73d7a7c14b3bd98523f13f739ae7b0780ee95f37
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-12-15T11:51:53-08:00
Commit Message:
FULLPIPE: Implement sceneHandler05_genFlies(). This completes the scene
Changed paths:
engines/fullpipe/scenes/scene05.cpp
diff --git a/engines/fullpipe/scenes/scene05.cpp b/engines/fullpipe/scenes/scene05.cpp
index 00861d9..0d0e0de 100644
--- a/engines/fullpipe/scenes/scene05.cpp
+++ b/engines/fullpipe/scenes/scene05.cpp
@@ -130,7 +130,24 @@ void sceneHandler05_resetTicks() {
}
void sceneHandler05_genFlies() {
- warning("STUB: sceneHandler05_genFlies()");
+ if (g_vars->scene05_floatersTicker <= 1000)
+ return;
+
+ if (g_fullpipe->_rnd->getRandomNumber(1)) {
+ int numFlies = g_fullpipe->_rnd->getRandomNumber(3) + 1;
+
+ for (int i = 0; i < numFlies; i++) {
+ int x = g_fullpipe->_rnd->getRandomNumber(55) + 538;
+ int y = g_fullpipe->_rnd->getRandomNumber(60) + i * 30 + 520;
+
+ g_fullpipe->_floaters->genFlies(g_fullpipe->_currentScene, x, y, 5, 1);
+ g_fullpipe->_floaters->_array2.back()->val2 = 585;
+ g_fullpipe->_floaters->_array2.back()->val3 = -70;
+ g_fullpipe->_floaters->_array2.back()->val11 = 8.0;
+ }
+ }
+
+ g_vars->scene05_floatersTicker = 0;
}
void sceneHandler05_showHandle() {
More information about the Scummvm-git-logs
mailing list