ZVISION: Rename 'x' variable in changeLocation to 'offset'

Since it can be in either the x or the y direction

4 files changed, 9 insertions, 9 deletions

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 2316530c67..504c250597 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -83,12 +83,12 @@ bool ActionAttenuate::execute(ZVision *engine) {
 //////////////////////////////////////////////////////////////////////////////
 
 ActionChangeLocation::ActionChangeLocation(const Common::String &line) {
-	sscanf(line.c_str(), "%*[^(](%c,%c,%c%c,%u)", &_world, &_room, &_node, &_view, &_x);
+	sscanf(line.c_str(), "%*[^(](%c,%c,%c%c,%u)", &_world, &_room, &_node, &_view, &_offset);
 }
 
 bool ActionChangeLocation::execute(ZVision *engine) {
 	// We can't directly call ScriptManager::ChangeLocationIntern() because doing so clears all the Puzzles, and thus would corrupt the current puzzle checking
-	engine->getScriptManager()->changeLocation(_world, _room, _node, _view, _x);
+	engine->getScriptManager()->changeLocation(_world, _room, _node, _view, _offset);
 	// Tell the puzzle system to stop checking any more puzzles
 	return false;
 }
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 511f3d9b83..aa67be20c7 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -126,7 +126,7 @@ private:
 	char _room;
 	char _node;
 	char _view;
-	uint32 _x;
+	uint32 _offset;
 };
 
 class ActionCrossfade : public ResultAction {
diff --git a/engines/zvision/script_manager.cpp b/engines/zvision/script_manager.cpp
index 6aaf5773e0..5c0e336a5d 100644
--- a/engines/zvision/script_manager.cpp
+++ b/engines/zvision/script_manager.cpp
@@ -191,19 +191,19 @@ void ScriptManager::addActionNode(const Common::SharedPtr<ActionNode> &node) {
 	_activeNodes.push_back(node);
 }
 
-void ScriptManager::changeLocation(char world, char room, char node, char view, uint32 x) {
+void ScriptManager::changeLocation(char world, char room, char node, char view, uint32 offset) {
 	_nextLocation.world = world;
 	_nextLocation.room = room;
 	_nextLocation.node = node;
 	_nextLocation.view = view;
-	_nextLocation.x = x;
+	_nextLocation.offset = offset;
 
 	_changeLocation = true;
 }
 
 void ScriptManager::changeLocationIntern() {
 	assert(_nextLocation.world != 0);
-	debug("Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.x);
+	debug("Changing location to: %c %c %c %c %u", _nextLocation.world, _nextLocation.room, _nextLocation.node, _nextLocation.view, _nextLocation.offset);
 
 	// Clear all the containers
 	_referenceTable.clear();
@@ -217,7 +217,7 @@ void ScriptManager::changeLocationIntern() {
 	_engine->getCursorManager()->revertToIdle();
 
 	// Change the background position
-	_engine->getRenderManager()->setBackgroundPosition(_nextLocation.x);
+	_engine->getRenderManager()->setBackgroundPosition(_nextLocation.offset);
 
 	// Reset the background velocity
 	_engine->getRenderManager()->setBackgroundVelocity(0);
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 8e79548f77..c0801edd5e 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -44,7 +44,7 @@ struct Location {
 	char room;
 	char node;
 	char view;
-	uint32 x;
+	uint32 offset;
 };
 
 class ScriptManager {
@@ -86,7 +86,7 @@ public:
 
 	void addActionNode(const Common::SharedPtr<ActionNode> &node);
 
-	void changeLocation(char world, char room, char node, char view, uint32 x);
+	void changeLocation(char world, char room, char node, char view, uint32 offset);
 
 private:
 	void createReferenceTable();