summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/animatedsprite.cpp2
-rw-r--r--src/animatedsprite.h2
-rw-r--r--src/being.cpp4
-rw-r--r--src/compoundsprite.cpp4
-rw-r--r--src/compoundsprite.h2
-rw-r--r--src/imagesprite.h2
-rw-r--r--src/sprite.h2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 61223a876..f58ef62cc 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -229,7 +229,7 @@ bool AnimatedSprite::draw(Graphics *graphics, int posX, int posY) const
posY + mFrame->offsetY);
}
-bool AnimatedSprite::setDirection(SpriteDirection direction)
+bool AnimatedSprite::setSpriteDirection(SpriteDirection direction)
{
if (mDirection != direction)
{
diff --git a/src/animatedsprite.h b/src/animatedsprite.h
index e8b866cb4..6ccf2419a 100644
--- a/src/animatedsprite.h
+++ b/src/animatedsprite.h
@@ -69,7 +69,7 @@ class AnimatedSprite : public Sprite
const Image* getImage() const;
- bool setDirection(SpriteDirection direction);
+ bool setSpriteDirection(SpriteDirection direction);
int getNumberOfLayers()
{ return 1; }
diff --git a/src/being.cpp b/src/being.cpp
index 5b9e4496d..bfd06f2f0 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -1003,7 +1003,7 @@ void Being::setDirection(Uint8 direction)
}
mSpriteDirection = dir;
- CompoundSprite::setDirection(dir);
+ CompoundSprite::setSpriteDirection(dir);
}
Uint8 Being::calcDirection() const
@@ -1567,7 +1567,7 @@ void Being::setSprite(unsigned int slot, int id, std::string color,
}
if (equipmentSprite)
- equipmentSprite->setDirection(getSpriteDirection());
+ equipmentSprite->setSpriteDirection(getSpriteDirection());
CompoundSprite::setSprite(slot, equipmentSprite);
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index fe724e170..4f8333525 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -193,7 +193,7 @@ const Image* CompoundSprite::getImage() const
return mImage;
}
-bool CompoundSprite::setDirection(SpriteDirection direction)
+bool CompoundSprite::setSpriteDirection(SpriteDirection direction)
{
bool ret = false;
@@ -201,7 +201,7 @@ bool CompoundSprite::setDirection(SpriteDirection direction)
for (it = begin(), it_end = end(); it != it_end; ++it)
{
if (*it)
- ret |= (*it)->setDirection(direction);
+ ret |= (*it)->setSpriteDirection(direction);
}
mNeedsRedraw |= ret;
diff --git a/src/compoundsprite.h b/src/compoundsprite.h
index dc9c15366..9d5a42a1b 100644
--- a/src/compoundsprite.h
+++ b/src/compoundsprite.h
@@ -58,7 +58,7 @@ public:
virtual const Image* getImage() const;
- virtual bool setDirection(SpriteDirection direction);
+ virtual bool setSpriteDirection(SpriteDirection direction);
int getNumberOfLayers() const;
diff --git a/src/imagesprite.h b/src/imagesprite.h
index 163c93876..914a54365 100644
--- a/src/imagesprite.h
+++ b/src/imagesprite.h
@@ -61,7 +61,7 @@ public:
const Image* getImage() const
{ return mImage; }
- virtual bool setDirection(SpriteDirection direction _UNUSED_)
+ virtual bool setSpriteDirection(SpriteDirection direction _UNUSED_)
{ return false; }
int getNumberOfLayers()
diff --git a/src/sprite.h b/src/sprite.h
index 4edad7b59..9c6401dcb 100644
--- a/src/sprite.h
+++ b/src/sprite.h
@@ -80,7 +80,7 @@ class Sprite
*
* @returns true if the sprite changed, false otherwise
*/
- virtual bool setDirection(SpriteDirection direction) = 0;
+ virtual bool setSpriteDirection(SpriteDirection direction) = 0;
/**
* Sets the alpha value of the animated sprite