diff options
| author | RichieSams | 2013-11-01 02:50:56 -0500 |
|---|---|---|
| committer | RichieSams | 2013-11-01 02:52:58 -0500 |
| commit | 20f8e05cc3d1661ed5d5af9c9e1420cce36b6893 (patch) | |
| tree | fd1d5e4cec19a93277ff4f13555f17da1633ba57 | |
| parent | e50797d6b1c6775271523f2ce55cb1896178bb5d (diff) | |
| download | scummvm-rg350-20f8e05cc3d1661ed5d5af9c9e1420cce36b6893.tar.gz scummvm-rg350-20f8e05cc3d1661ed5d5af9c9e1420cce36b6893.tar.bz2 scummvm-rg350-20f8e05cc3d1661ed5d5af9c9e1420cce36b6893.zip | |
ZVISION: Move StateFlags inside ScriptManager class and fix build errors
| -rw-r--r-- | engines/zvision/scripting/actions.cpp | 6 | ||||
| -rw-r--r-- | engines/zvision/scripting/script_manager.h | 13 |
2 files changed, 10 insertions, 9 deletions
diff --git a/engines/zvision/scripting/actions.cpp b/engines/zvision/scripting/actions.cpp index 6ecbbb97c8..878fa752d5 100644 --- a/engines/zvision/scripting/actions.cpp +++ b/engines/zvision/scripting/actions.cpp @@ -125,7 +125,7 @@ bool ActionDisableControl::execute(ZVision *engine) { debug("Disabling control %u", _key); ScriptManager *scriptManager = engine->getScriptManager(); - scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) | StateFlags::DISABLED); + scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) | ScriptManager::DISABLED); return true; } @@ -143,7 +143,7 @@ bool ActionEnableControl::execute(ZVision *engine) { debug("Enabling control %u", _key); ScriptManager *scriptManager = engine->getScriptManager(); - scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) & ~StateFlags::DISABLED); + scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) & ~ScriptManager::DISABLED); return true; } @@ -227,7 +227,7 @@ bool ActionPreloadAnimation::execute(ZVision *engine) { // Create the control, but disable it until PlayPreload is called ScriptManager *scriptManager = engine->getScriptManager(); scriptManager->addControl(new AnimationControl(engine, _key, _fileName)); - scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) | StateFlags::DISABLED); + scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) | ScriptManager::DISABLED); return true; } diff --git a/engines/zvision/scripting/script_manager.h b/engines/zvision/scripting/script_manager.h index 08dfcf92ec..ab9b03ed30 100644 --- a/engines/zvision/scripting/script_manager.h +++ b/engines/zvision/scripting/script_manager.h @@ -49,12 +49,6 @@ struct Location { uint32 offset; }; -enum StateFlags { - ONCE_PER_INST = 0x01, - DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria - DISABLED = 0x04 -}; - typedef Common::HashMap<uint32, Common::Array<Puzzle *> > PuzzleMap; typedef Common::List<Puzzle *> PuzzleList; typedef Common::Queue<Puzzle *> PuzzleQueue; @@ -67,6 +61,13 @@ public: ScriptManager(ZVision *engine); ~ScriptManager(); +public: + enum StateFlags { + ONCE_PER_INST = 0x01, + DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria + DISABLED = 0x04 + }; + private: ZVision *_engine; /** |