thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ZVISION: Move StateFlags inside ScriptManager class and fix build errors

Browse source
This commit is contained in:
RichieSams 2013-11-01 02:50:56 -05:00
parent e50797d6b1
commit 20f8e05cc3
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engines/zvision/scripting/actions.cpp
View file

@ -125,7 +125,7 @@ bool ActionDisableControl::execute(ZVision *engine) {
debug("Disabling control %u", _key); debug("Disabling control %u", _key);
ScriptManager *scriptManager = engine->getScriptManager(); ScriptManager *scriptManager = engine->getScriptManager();
scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) | StateFlags::DISABLED); scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) | ScriptManager::DISABLED);
return true; return true;
} }
@ -143,7 +143,7 @@ bool ActionEnableControl::execute(ZVision *engine) {
debug("Enabling control %u", _key); debug("Enabling control %u", _key);
ScriptManager *scriptManager = engine->getScriptManager(); ScriptManager *scriptManager = engine->getScriptManager();
scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) & ~StateFlags::DISABLED); scriptManager->setStateFlags(_key, scriptManager->getStateFlags(_key) & ~ScriptManager::DISABLED);
return true; return true;
} }
@ -227,7 +227,7 @@ bool ActionPreloadAnimation::execute(ZVision *engine) {
// Create the control, but disable it until PlayPreload is called // Create the control, but disable it until PlayPreload is called
ScriptManager *scriptManager = engine->getScriptManager(); ScriptManager *scriptManager = engine->getScriptManager();
scriptManager->addControl(new AnimationControl(engine, _key, _fileName)); 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; return true;
} }

13
engines/zvision/scripting/script_manager.h
View file

@ -49,12 +49,6 @@ struct Location {
uint32 offset; 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::HashMap<uint32, Common::Array<Puzzle *> > PuzzleMap;
typedef Common::List<Puzzle *> PuzzleList; typedef Common::List<Puzzle *> PuzzleList;
typedef Common::Queue<Puzzle *> PuzzleQueue; typedef Common::Queue<Puzzle *> PuzzleQueue;
@ -67,6 +61,13 @@ public:
ScriptManager(ZVision *engine); ScriptManager(ZVision *engine);
~ScriptManager(); ~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: private:
ZVision *_engine; ZVision *_engine;
/** /**