diff options
| -rw-r--r-- | engines/zvision/script_manager.cpp | 22 | ||||
| -rw-r--r-- | engines/zvision/script_manager.h | 2 |
2 files changed, 17 insertions, 7 deletions
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp index 45e1459293..6330e206be 100644 --- a/engines/zvision/script_manager.cpp +++ b/engines/zvision/script_manager.cpp @@ -37,8 +37,7 @@ namespace ZVision { ScriptManager::ScriptManager(ZVision *engine) - : _engine(engine), - _changeLocation(false) { + : _engine(engine) { } ScriptManager::~ScriptManager() { @@ -61,11 +60,6 @@ void ScriptManager::initialize() { void ScriptManager::update(uint deltaTimeMillis) { updateNodes(deltaTimeMillis); checkPuzzleCriteria(); - - if (_changeLocation) { - changeLocationIntern(); - _changeLocation = false; - } } void ScriptManager::createReferenceTable() { @@ -333,6 +327,20 @@ void ScriptManager::changeLocation(char world, char room, char node, char view, // Create the puzzle reference table createReferenceTable(); + + // Update _currentLocation + _currentLocation.world = world; + _currentLocation.room = room; + _currentLocation.node = node; + _currentLocation.view = view; + _currentLocation.offset = offset; +} + +Location ScriptManager::getCurrentLocation() const { + Location location = _currentLocation; + location.offset = _engine->getRenderManager()->getCurrentBackgroundOffset(); + + return location; } } // End of namespace ZVision diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h index 723f4fe032..96123a8468 100644 --- a/engines/zvision/script_manager.h +++ b/engines/zvision/script_manager.h @@ -110,6 +110,8 @@ public: void changeLocation(char world, char room, char node, char view, uint32 offset); + Location getCurrentLocation() const; + private: void createReferenceTable(); void updateNodes(uint deltaTimeMillis); |