diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
| commit | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (patch) | |
| tree | 5aad5623d352ec0b4aa245856958c61a384861c7 /src/particle.h | |
| parent | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (diff) | |
| parent | 71fe51d38a406012e166589b7b720d83c1ab3ade (diff) | |
| download | manaplus-stripped1.1.11.27.tar.gz manaplus-stripped1.1.11.27.tar.bz2 manaplus-stripped1.1.11.27.tar.xz manaplus-stripped1.1.11.27.zip | |
Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27
Conflicts:
data/Makefile.am
Diffstat (limited to 'src/particle.h')
| -rw-r--r-- | src/particle.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/particle.h b/src/particle.h index 0a4a2253d..ad448a054 100644 --- a/src/particle.h +++ b/src/particle.h @@ -25,17 +25,12 @@ #include "actor.h" #include "guichanfwd.h" +#include "localconsts.h" #include "vector.h" #include <list> #include <string> -#ifdef __GNUC__ -#define A_UNUSED __attribute__ ((unused)) -#else -#define A_UNUSED -#endif - class Map; class Particle; class ParticleEmitter; @@ -114,6 +109,12 @@ class Particle : public Actor { return static_cast<int>(mPos.y) - 16; } /** + * Necessary for sorting with the other sprites for sorting only. + */ + virtual int getSortPixelY() const + { return static_cast<int>(mPos.y) - 16; } + + /** * Creates a blank particle as a child of the current particle * Useful for creating target particles */ @@ -274,7 +275,8 @@ class Particle : public Actor virtual float getAlpha() const { return 1.0f; } - virtual void setAlpha(float alpha A_UNUSED) {} + virtual void setAlpha(float alpha A_UNUSED) + { } virtual void setDeathEffect(const std::string &effectFile, char conditions) |