From 6c5362fbd4c907af8cd873df1900cef028e156af Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Mon, 13 Feb 2012 20:13:04 +0100 Subject: 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 --- src/particle.cpp | 5 ----- src/particle.h | 5 ----- 2 files changed, 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 @@ -92,11 +92,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 */ -- cgit v1.2.3-70-g09d2