ZVISION: Move the ScriptManager update functions to a single update() function.

Then make the individual update functions private

3 files changed, 9 insertions, 4 deletions

diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 027fec43a1..4ccbbef92d 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -39,6 +39,11 @@ void ScriptManager::initialize() {
 	parseScrFile("universe.scr", true);
 }
 
+void ScriptManager::update(uint deltaTimeMillis) {
+	updateNodes(deltaTimeMillis);
+	checkPuzzleCriteria();
+}
+
 void ScriptManager::createReferenceTable() {
 	// Iterate through each local Puzzle
 	for (Common::List<Puzzle>::iterator activePuzzleIter = _activePuzzles.begin(); activePuzzleIter != _activePuzzles.end(); activePuzzleIter++) {
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 63dc4f8804..29994259c9 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -67,8 +67,7 @@ private:
 public:
 	
 	void initialize();
-	void updateNodes(uint deltaTimeMillis);
-	void checkPuzzleCriteria();
+	void update(uint deltaTimeMillis);
 
 	uint getStateValue(uint32 key);
 	void setStateValue(uint32 key, uint value);
@@ -80,6 +79,8 @@ public:
 
 private:
 	void createReferenceTable();
+	void updateNodes(uint deltaTimeMillis);
+	void checkPuzzleCriteria();
 
 	/**
 	 * Parses a script file into triggers and events
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index e1f719df0a..0dd62d7a29 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -133,8 +133,7 @@ Common::Error ZVision::run() {
 		
 		processEvents();
 
-		_scriptManager->updateNodes(_clock.getDeltaTime());
-		_scriptManager->checkPuzzleCriteria();
+		_scriptManager->update(_clock.getDeltaTime());
 
 		// Update the screen
 		_system->updateScreen();