summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Sehmisch <tmw@crushnet.org>2006-09-16 21:50:50 +0000
committerPhilipp Sehmisch <tmw@crushnet.org>2006-09-16 21:50:50 +0000
commit237278aa4d0bb1264551d1d52bcf29c36173073a (patch)
tree7fbf5e49f20bfe9fad3ffcf549bc02752207261e /src
parente9ce90588d9649084fbeac0ec016946ecdc0236b (diff)
downloadmana-237278aa4d0bb1264551d1d52bcf29c36173073a.tar.gz
mana-237278aa4d0bb1264551d1d52bcf29c36173073a.tar.bz2
mana-237278aa4d0bb1264551d1d52bcf29c36173073a.tar.xz
mana-237278aa4d0bb1264551d1d52bcf29c36173073a.zip
another variable name change doener suggested
Diffstat (limited to 'src')
-rw-r--r--src/animatedsprite.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 79aa189c..36851366 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -102,8 +102,8 @@ AnimatedSprite::AnimatedSprite(const std::string& animationFile, int variant):
}
- SpriteAction actionEnum = makeSpriteAction(actionName);
- if (actionEnum == ACTION_INVALID)
+ SpriteAction actionType = makeSpriteAction(actionName);
+ if (actionType == ACTION_INVALID)
{
logger->log("Warning: Unknown action \"%s\" defined in %s",
actionName.c_str(),
@@ -112,7 +112,7 @@ AnimatedSprite::AnimatedSprite(const std::string& animationFile, int variant):
}
Action *action = new Action();
action->setSpriteset(mSpritesets[imageset]);
- mActions[actionEnum] = action;
+ mActions[actionType] = action;
// When first action set it as default direction
if (mActions.empty())
@@ -132,8 +132,8 @@ AnimatedSprite::AnimatedSprite(const std::string& animationFile, int variant):
std::string directionName = getProperty(animationNode, "direction", "");
- SpriteDirection directionEnum = makeSpriteDirection(directionName);
- if (directionEnum == DIRECTION_INVALID)
+ SpriteDirection directionType = makeSpriteDirection(directionName);
+ if (directionType == DIRECTION_INVALID)
{
logger->log("Warning: Unknown direction \"%s\" defined for action %s in %s",
directionName.c_str(),
@@ -143,7 +143,7 @@ AnimatedSprite::AnimatedSprite(const std::string& animationFile, int variant):
}
Animation *animation = new Animation();
- action->setAnimation(directionEnum, animation);
+ action->setAnimation(directionType, animation);
// Get animation phases
for (xmlNodePtr phaseNode = animationNode->xmlChildrenNode;