Skip to content
Permalink
Browse files

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

  • Loading branch information...
RichieSams committed Jul 11, 2013
1 parent 0451503 commit 61a2fffafd708828dd6cef4dff4dc971e8541654
Showing with 24 additions and 24 deletions.
  1. +13 −13 engines/zvision/actions.cpp
  2. +11 −11 engines/zvision/actions.h
@@ -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;
}

@@ -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 @@ class ResultAction {
class ActionAdd : public ResultAction {
public:
ActionAdd(Common::String line);
bool execute(ZVision *zVision);
bool execute(ZVision *engine);

private:
uint32 _key;
@@ -85,7 +85,7 @@ class ActionAdd : public ResultAction {
class ActionAssign : public ResultAction {
public:
ActionAssign(Common::String line);
bool execute(ZVision *zVision);
bool execute(ZVision *engine);

private:
uint32 _key;
@@ -95,7 +95,7 @@ class ActionAssign : public ResultAction {
class ActionAttenuate : public ResultAction {
public:
ActionAttenuate(Common::String line);
bool execute(ZVision *zVision);
bool execute(ZVision *engine);

private:
uint32 _key;
@@ -105,7 +105,7 @@ class ActionAttenuate : public ResultAction {
class ActionChangeLocation : public ResultAction {
public:
ActionChangeLocation(Common::String line);
bool execute(ZVision *zVision);
bool execute(ZVision *engine);

private:
char _world;
@@ -117,7 +117,7 @@ class ActionChangeLocation : public ResultAction {
class ActionCrossfade : public ResultAction {
public:
ActionCrossfade(Common::String line);
bool execute(ZVision *zVision);
bool execute(ZVision *engine);

private:
uint32 _keyOne;
@@ -132,7 +132,7 @@ class ActionCrossfade : public ResultAction {
class ActionPlayAnimation : public ResultAction {
public:
ActionPlayAnimation(Common::String line);
bool execute(ZVision *zVision);
bool execute(ZVision *engine);

private:
uint32 _key;
@@ -151,7 +151,7 @@ class ActionPlayAnimation : public ResultAction {
class ActionPreloadAnimation : public ResultAction {
public:
ActionPreloadAnimation(Common::String line);
bool execute(ZVision *zVision);
bool execute(ZVision *engine);

private:
uint32 _key;
@@ -164,13 +164,13 @@ class ActionPreloadAnimation : public ResultAction {
//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 @@ class ActionRandom : public ResultAction {
class ActionTimer : public ResultAction {
public:
ActionTimer(Common::String line);
bool execute(ZVision *zVision);
bool execute(ZVision *engine);

private:
uint32 _key;

0 comments on commit 61a2fff

Please sign in to comment.
You can’t perform that action at this time.