diff options
| author | Andrei Prykhodko | 2019-05-08 12:01:22 +0300 |
|---|---|---|
| committer | Andrei Prykhodko | 2019-05-08 12:01:22 +0300 |
| commit | 3c67ce0eed26712946244d06e119ee398562a704 (patch) | |
| tree | dc3266ceb7cecced0a6316119d8c46fc081d5a01 /engines/pink/objects/actions | |
| parent | 711b7399a07d602df1b33f98a4b2225770b51c30 (diff) | |
| download | scummvm-rg350-3c67ce0eed26712946244d06e119ee398562a704.tar.gz scummvm-rg350-3c67ce0eed26712946244d06e119ee398562a704.tar.bz2 scummvm-rg350-3c67ce0eed26712946244d06e119ee398562a704.zip | |
PINK: removed usage of global variable
Diffstat (limited to 'engines/pink/objects/actions')
| -rw-r--r-- | engines/pink/objects/actions/action_play_with_sfx.cpp | 5 | ||||
| -rw-r--r-- | engines/pink/objects/actions/action_play_with_sfx.h | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/engines/pink/objects/actions/action_play_with_sfx.cpp b/engines/pink/objects/actions/action_play_with_sfx.cpp index 3064215fd3..0ebb869411 100644 --- a/engines/pink/objects/actions/action_play_with_sfx.cpp +++ b/engines/pink/objects/actions/action_play_with_sfx.cpp @@ -26,11 +26,10 @@ #include "pink/objects/actors/actor.h" #include "pink/objects/actions/action_play_with_sfx.h" #include "pink/objects/pages/game_page.h" +#include "pink/objects/sequences/sequencer.h" namespace Pink { -bool g_skipping = false; // FIXME: non-const global var - ActionPlayWithSfx::~ActionPlayWithSfx() { ActionPlay::end(); for (uint i = 0; i < _sfxArray.size(); ++i) { @@ -77,7 +76,7 @@ void ActionPlayWithSfx::end() { ActionCEL::end(); debugC(6, kPinkDebugActions, "ActionPlayWithSfx %s of Actor %s is ended", _name.c_str(), _actor->getName().c_str()); // original bug fix - if (g_skipping) { + if (_actor->getPage()->getSequencer()->isSkipping()) { for (uint i = 0; i < _sfxArray.size(); ++i) { _sfxArray[i]->end(); } diff --git a/engines/pink/objects/actions/action_play_with_sfx.h b/engines/pink/objects/actions/action_play_with_sfx.h index 16d1855584..d595bc1069 100644 --- a/engines/pink/objects/actions/action_play_with_sfx.h +++ b/engines/pink/objects/actions/action_play_with_sfx.h @@ -28,8 +28,6 @@ namespace Pink { -extern bool g_skipping; - class ActionSfx; class ActionPlayWithSfx : public ActionPlay { |