From 71fa9fe2184d9e1677661b1481f1fbb561d4e0c0 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Wed, 27 Nov 2013 23:41:50 -0500 Subject: FULLPIPE: Give some names in scene04 --- engines/fullpipe/scenes.cpp | 2 +- engines/fullpipe/scenes.h | 2 +- engines/fullpipe/scenes/scene04.cpp | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/engines/fullpipe/scenes.cpp b/engines/fullpipe/scenes.cpp index 6771fe8ec8..7cf469df00 100644 --- a/engines/fullpipe/scenes.cpp +++ b/engines/fullpipe/scenes.cpp @@ -79,7 +79,7 @@ Vars::Vars() { scene04_var01 = 0; scene04_var02 = 0; scene04_var04 = 0; - scene04_var05 = 0; + scene04_walkingKozyawka = 0; scene04_var06 = 0; scene04_var07 = 0; scene04_var08 = 0; diff --git a/engines/fullpipe/scenes.h b/engines/fullpipe/scenes.h index 0ff34d51b5..c890dd8d11 100644 --- a/engines/fullpipe/scenes.h +++ b/engines/fullpipe/scenes.h @@ -105,7 +105,7 @@ public: int scene04_var01; int scene04_var02; int scene04_var04; - StaticANIObject *scene04_var05; + StaticANIObject *scene04_walkingKozyawka; int scene04_var06; int scene04_var07; int scene04_var08; diff --git a/engines/fullpipe/scenes/scene04.cpp b/engines/fullpipe/scenes/scene04.cpp index db5e327c14..28a9b6fc00 100644 --- a/engines/fullpipe/scenes/scene04.cpp +++ b/engines/fullpipe/scenes/scene04.cpp @@ -143,7 +143,7 @@ void scene04_initScene(Scene *sc) { g_vars->scene04_var02 = 0; g_vars->scene04_soundPlaying = 0; g_vars->scene04_var04 = 0; - g_vars->scene04_var05 = 0; + g_vars->scene04_walkingKozyawka = 0; g_vars->scene04_var06 = 2; g_vars->scene04_dynamicPhaseIndex = 0; @@ -327,13 +327,13 @@ void sceneHandler04_sub1(ExCommand *ex) { g_fullpipe->_behaviorManager->setFlagByStaticAniObject(g_fullpipe->_aniMan, 1); } -void sceneHandler04_sub3() { +void sceneHandler04_walkKozyawka() { if (g_vars->scene04_kozyawkiObjList.size()) { - g_vars->scene04_var05 = g_vars->scene04_kozyawkiObjList.front(); + g_vars->scene04_walkingKozyawka = g_vars->scene04_kozyawkiObjList.front(); g_vars->scene04_kozyawkiObjList.pop_front(); MessageQueue *mq = new MessageQueue(g_fullpipe->_currentScene->getMessageQueueById(QU_KOZAW_WALK), 0, 1); - mq->replaceKeyCode(-1, g_vars->scene04_var05->_okeyCode); + mq->replaceKeyCode(-1, g_vars->scene04_walkingKozyawka->_okeyCode); mq->chain(0); } } @@ -457,13 +457,14 @@ int sceneHandler04(ExCommand *ex) { break; case MSG_KOZAWRESTART: - if (g_vars->scene04_var05) { - g_vars->scene04_kozyawkiObjList.push_back(g_vars->scene04_var05); - g_vars->scene04_var05->hide(); - g_vars->scene04_var05 = 0; + if (g_vars->scene04_walkingKozyawka) { + g_vars->scene04_kozyawkiObjList.push_back(g_vars->scene04_walkingKozyawka); + g_vars->scene04_walkingKozyawka->hide(); + g_vars->scene04_walkingKozyawka = 0; } + if (g_vars->scene04_soundPlaying) - sceneHandler04_sub3(); + sceneHandler04_walkKozyawka(); break; -- cgit v1.2.3