libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-30 05:34:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FULLPIPE: Renames in scene05

Browse Source
This commit is contained in:
Eugene Sandulenko 2013-12-15 16:45:28 +02:00
parent cb7f258a12
commit ab688e15a2
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/fullpipe/scenes.cpp
View File

@ -106,9 +106,9 @@ Vars::Vars() {
scene05_handle = 0; scene05_handle = 0;
scene05_wacko = 0; scene05_wacko = 0;
scene05_bigHatch = 0; scene05_bigHatch = 0;
scene05_var01 = 0; scene05_wackoTicker = 0;
scene05_var02 = 0; scene05_handleFlipper = 0;
scene05_var03 = 0; scene05_floatersTicker = 0;
selector = 0; selector = 0;
} }

6
engines/fullpipe/scenes.h
View File

@ -137,9 +137,9 @@ public:
StaticANIObject *scene05_handle; StaticANIObject *scene05_handle;
StaticANIObject *scene05_wacko; StaticANIObject *scene05_wacko;
StaticANIObject *scene05_bigHatch; StaticANIObject *scene05_bigHatch;
int scene05_var01; int scene05_wackoTicker;
int scene05_var02; int scene05_handleFlipper;
int scene05_var03; int scene05_floatersTicker;
PictureObject *selector; PictureObject *selector;
}; };

25
engines/fullpipe/scenes/scene05.cpp
View File

@ -40,9 +40,9 @@ void scene05_initScene(Scene *sc) {
g_vars->scene05_bigHatch = sc->getStaticANIObject1ById(ANI_BIGLUK, -1); g_vars->scene05_bigHatch = sc->getStaticANIObject1ById(ANI_BIGLUK, -1);
g_vars->scene05_var01 = 0; g_vars->scene05_wackoTicker = 0;
g_vars->scene05_var02 = 1; g_vars->scene05_handleFlipper = 1;
g_vars->scene05_var03 = 1000; g_vars->scene05_floatersTicker = 1000;
Scene *oldscene = g_fullpipe->_currentScene; Scene *oldscene = g_fullpipe->_currentScene;
@ -124,9 +124,9 @@ void sceneHandler05_makeWackoFeedback() {
void sceneHandler05_resetTicks() { void sceneHandler05_resetTicks() {
if (g_fullpipe->_aniMan->_movement && (g_fullpipe->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP if (g_fullpipe->_aniMan->_movement && (g_fullpipe->_aniMan->_movement->_id == MV_MANHDL_HANDLEUP
|| g_fullpipe->_aniMan->_movement->_id == MV_MANHDL_HANDLEDOWN)) || g_fullpipe->_aniMan->_movement->_id == MV_MANHDL_HANDLEDOWN))
g_vars->scene05_var01 = g_fullpipe->_updateTicks; g_vars->scene05_wackoTicker = g_fullpipe->_updateTicks;
else else
g_vars->scene05_var01 = 0; g_vars->scene05_wackoTicker = 0;
} }
void sceneHandler05_genFlies() { void sceneHandler05_genFlies() {
@ -297,7 +297,7 @@ int sceneHandler05(ExCommand *ex) {
if (!g_fullpipe->_aniMan->_movement || (g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP if (!g_fullpipe->_aniMan->_movement || (g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP
&& g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) { && g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) {
sceneHandler05_makeWackoFeedback(); sceneHandler05_makeWackoFeedback();
g_vars->scene05_var01 = 0; g_vars->scene05_wackoTicker = 0;
} }
break; break;
@ -336,21 +336,22 @@ int sceneHandler05(ExCommand *ex) {
res = 1; res = 1;
} }
if (g_vars->scene05_var01) { if (g_vars->scene05_wackoTicker) {
if ((g_fullpipe->_updateTicks - g_vars->scene05_var01) > 62) { if ((g_fullpipe->_updateTicks - g_vars->scene05_wackoTicker) > 62) {
if (!g_fullpipe->_aniMan->_movement || (g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP if (!g_fullpipe->_aniMan->_movement || (g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEUP
&& g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) { && g_fullpipe->_aniMan->_movement->_id != MV_MANHDL_HANDLEDOWN)) {
if (g_vars->scene05_var02 % 2) if (g_vars->scene05_handleFlipper % 2)
sceneHandler05_makeWackoFeedback(); 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->_floaters->update();
g_fullpipe->_behaviorManager->updateBehaviors(); g_fullpipe->_behaviorManager->updateBehaviors();