ZVISION: Standardize naming conventions to fit the rest of the code base

2 files changed, 24 insertions, 24 deletions

diff --git a/engines/zvision/actions.cpp b/engines/zvision/actions.cpp
index 23f7f166c8..9bdc6aa981 100644
--- a/engines/zvision/actions.cpp
+++ b/engines/zvision/actions.cpp
@@ -35,8 +35,8 @@ ActionAdd::ActionAdd(Common::String line) {
 	sscanf(line.c_str(), ":add(%u,%hhu)", &_key, &_value);
 }
 
-bool ActionAdd::execute(ZVision *zVision) {
-	zVision->getScriptManager()->addToStateValue(_key, _value);
+bool ActionAdd::execute(ZVision *engine) {
+	engine->getScriptManager()->addToStateValue(_key, _value);
 	return true;
 }
 
@@ -49,8 +49,8 @@ ActionAssign::ActionAssign(Common::String line) {
 	sscanf(line.c_str(), ":assign(%u, %hhu)", &_key, &_value);
 }
 
-bool ActionAssign::execute(ZVision *zVision) {
-	zVision->getScriptManager()->setStateValue(_key, _value);
+bool ActionAssign::execute(ZVision *engine) {
+	engine->getScriptManager()->setStateValue(_key, _value);
 	return true;
 }
 
@@ -63,7 +63,7 @@ ActionAttenuate::ActionAttenuate(Common::String line) {
 	sscanf(line.c_str(), ":assign(%u, %hd)", &_key, &_attenuation);
 }
 
-bool ActionAttenuate::execute(ZVision *zVision) {
+bool ActionAttenuate::execute(ZVision *engine) {
 	// TODO: Implement
 	return true;
 }
@@ -77,7 +77,7 @@ ActionChangeLocation::ActionChangeLocation(Common::String line) {
 	sscanf(line.c_str(), ":change_location(%c,%c,%2c,%hu)", &_world, &_room, &_nodeview, &_x);
 }
 
-bool ActionChangeLocation::execute(ZVision *zVision) {
+bool ActionChangeLocation::execute(ZVision *engine) {
 	// TODO: Implement
 	return true;
 }
@@ -93,7 +93,7 @@ ActionCrossfade::ActionCrossfade(Common::String line) {
            &_keyOne, &_keyTwo, &_oneStartVolume, &_twoStartVolume, &_oneEndVolume, &_twoEndVolume, &_timeInMillis);
 }
 
-bool ActionCrossfade::execute(ZVision *zVision) {
+bool ActionCrossfade::execute(ZVision *engine) {
 	// TODO: Implement
 	return true;
 }
@@ -108,7 +108,7 @@ ActionPreloadAnimation::ActionPreloadAnimation(Common::String line) {
 	sscanf(line.c_str(), ":animpreload:%u(%s %*hhu %*hhu %u %hhu)", &_key, &_fileName, &_mask, &_framerate);
 }
 
-bool ActionPreloadAnimation::execute(ZVision *zVision) {
+bool ActionPreloadAnimation::execute(ZVision *engine) {
 	// TODO: Implement
 	return true;
 }
@@ -125,7 +125,7 @@ ActionPlayAnimation::ActionPlayAnimation(Common::String line) {
            &_key, &_x, &_y, &_width, &_height, &_start, &_end, &_loop, &_mask, &_framerate);
 }
 
-bool ActionPlayAnimation::execute(ZVision *zVision) {
+bool ActionPlayAnimation::execute(ZVision *engine) {
 	// TODO: Implement
 	return true;
 }
@@ -139,9 +139,9 @@ ActionRandom::ActionRandom(Common::String line) {
 	sscanf(line.c_str(), ":random:%u, %u)", &_key, &_max);
 }
 
-bool ActionRandom::execute(ZVision *zVision) {
-	uint32 randNumber = zVision->getRandomSource()->getRandomNumber(_max);
-	zVision->getScriptManager()->setStateValue(_key, randNumber);
+bool ActionRandom::execute(ZVision *engine) {
+	uint32 randNumber = engine->getRandomSource()->getRandomNumber(_max);
+	engine->getScriptManager()->setStateValue(_key, randNumber);
 	return true;
 }
 
@@ -154,8 +154,8 @@ ActionTimer::ActionTimer(Common::String line) {
 	sscanf(line.c_str(), ":timer:%u(%hu)", &_key, &_time);
 }
 
-bool ActionTimer::execute(ZVision *zVision) {
 	// TODO: Implement
+bool ActionTimer::execute(ZVision *engine) {
 	return true;
 }
 
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index a58ef68e34..aed8483ee7 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -35,7 +35,7 @@ class ZVision;
 class ResultAction {
 public:
 	virtual ~ResultAction() {}
-	virtual bool execute(ZVision *zVision) = 0;
+	virtual bool execute(ZVision *engine) = 0;
 };
 
 
@@ -75,7 +75,7 @@ public:
 class ActionAdd : public ResultAction {
 public:
 	ActionAdd(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	uint32 _key;
@@ -85,7 +85,7 @@ private:
 class ActionAssign : public ResultAction {
 public:
 	ActionAssign(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	uint32 _key;
@@ -95,7 +95,7 @@ private:
 class ActionAttenuate : public ResultAction {
 public:
 	ActionAttenuate(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	uint32 _key;
@@ -105,7 +105,7 @@ private:
 class ActionChangeLocation : public ResultAction {
 public:
 	ActionChangeLocation(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	char _world;
@@ -117,7 +117,7 @@ private:
 class ActionCrossfade : public ResultAction {
 public:
 	ActionCrossfade(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	uint32 _keyOne;
@@ -132,7 +132,7 @@ private:
 class ActionPlayAnimation : public ResultAction {
 public:
 	ActionPlayAnimation(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	uint32 _key;
@@ -151,7 +151,7 @@ private:
 class ActionPreloadAnimation : public ResultAction {
 public:
 	ActionPreloadAnimation(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	uint32 _key;
@@ -164,13 +164,13 @@ private:
 //class ActionUnloadAnimation : public ResultAction {
 //public:
 //	ActionUnloadAnimation(Common::String line);
-//	bool execute(ZVision *zVision);
+//	bool execute(ZVision *engine);
 //};
 
 class ActionRandom : public ResultAction {
 public:
 	ActionRandom(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	uint32 _key;
@@ -180,7 +180,7 @@ private:
 class ActionTimer : public ResultAction {
 public:
 	ActionTimer(Common::String line);
-	bool execute(ZVision *zVision);
+	bool execute(ZVision *engine);
 
 private:
 	uint32 _key;