summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-13 20:13:04 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2012-02-13 21:12:15 +0100
commit6c5362fbd4c907af8cd873df1900cef028e156af (patch)
tree575a87ae18b6a66b6db1e794461016d234005e57
parent831833f5cf698a6432e2cc801372fad5a87f895a (diff)
downloadmana-6c5362fbd4c907af8cd873df1900cef028e156af.tar.gz
mana-6c5362fbd4c907af8cd873df1900cef028e156af.tar.bz2
mana-6c5362fbd4c907af8cd873df1900cef028e156af.tar.xz
mana-6c5362fbd4c907af8cd873df1900cef028e156af.zip
Fixed drawing order of particles
This getDrawOrder hack is no longer necessary. It basically moved to the ActorSprite, in the other direction. Reviewed-by: Erik Schilling
-rw-r--r--src/particle.cpp5
-rw-r--r--src/particle.h5
2 files changed, 0 insertions, 10 deletions
diff --git a/src/particle.cpp b/src/particle.cpp
index e8c433c6..f84bb2ed 100644
--- a/src/particle.cpp
+++ b/src/particle.cpp
@@ -453,11 +453,6 @@ float Particle::getCurrentAlpha() const
return alpha;
}
-int Particle::getDrawOrder() const
-{
- return (int)(mPos.y) - 16;
-}
-
void Particle::clear()
{
delete_all(mChildEmitters);
diff --git a/src/particle.h b/src/particle.h
index c82cfbf1..18deb5c7 100644
--- a/src/particle.h
+++ b/src/particle.h
@@ -93,11 +93,6 @@ class Particle : public Actor
virtual bool draw(Graphics *graphics, int offsetX, int offsetY) const;
/**
- * Necessary for sorting with the other sprites.
- */
- virtual int getDrawOrder() const;
-
- /**
* Do not draw particles when beind other objects
*/
virtual bool drawnWhenBehind() const