diff options
| -rw-r--r-- | engines/fullpipe/scenes.cpp | 4 | ||||
| -rw-r--r-- | engines/fullpipe/scenes.h | 4 | ||||
| -rw-r--r-- | engines/fullpipe/scenes/scene04.cpp | 18 |
3 files changed, 13 insertions, 13 deletions
diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 7cf469df00..5b55d40752 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -90,8 +90,8 @@ Vars::Vars() { scene04_var13 = 0; scene04_var14 = 0; scene04_var15 = 0; - scene04_var16 = 0; - scene04_var17 = 0; + scene04_speakerVariant = 0; + scene04_speakerPhase = 0; scene04_var18 = 0; scene04_var19 = 0; scene04_var20 = 0; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index c890dd8d11..217cfd9a5c 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -116,8 +116,8 @@ public: int scene04_var13; int scene04_var14; int scene04_var15; - int scene04_var16; - int scene04_var17; + int scene04_speakerVariant; + int scene04_speakerPhase; int scene04_var18; int scene04_var19; int scene04_var20; diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index f36dc48e8a..30b5f0a254 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -44,17 +44,17 @@ static const int scene04_speakerPhases[] = { void scene04_speakerCallback(int *phase) { if (g_vars->scene04_soundPlaying) { - if (g_vars->scene04_var17 >= 0) { - *phase = scene04_speakerPhases[g_vars->scene04_var17 + 6 * g_vars->scene04_var16]; + if (g_vars->scene04_speakerPhase >= 0) { + *phase = scene04_speakerPhases[g_vars->scene04_speakerPhase + 6 * g_vars->scene04_speakerVariant]; - g_vars->scene04_var17++; + g_vars->scene04_speakerPhase++; - if (scene04_speakerPhases[g_vars->scene04_var17 + 6 * g_vars->scene04_var16] < 0) { - g_vars->scene04_var17 = 0; - g_vars->scene04_var16 = g_fullpipe->_rnd->getRandomNumber(2); + if (scene04_speakerPhases[g_vars->scene04_speakerPhase + 6 * g_vars->scene04_speakerVariant] < 0) { + g_vars->scene04_speakerPhase = 0; + g_vars->scene04_speakerVariant = g_fullpipe->_rnd->getRandomNumber(2); } } else { - ++g_vars->scene04_var17; + ++g_vars->scene04_speakerPhase; } } } @@ -188,8 +188,8 @@ void scene04_initScene(Scene *sc) { g_vars->scene04_speaker->_callback2 = scene04_speakerCallback; g_vars->scene04_speaker->startAnim(MV_SPK4_PLAY, 0, -1); - g_vars->scene04_var16 = 0; - g_vars->scene04_var17 = 0; + g_vars->scene04_speakerVariant = 0; + g_vars->scene04_speakerPhase = 0; g_fullpipe->initArcadeKeys("SC_4"); } |