diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /src/particle.h | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2 plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz plus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/particle.h')
| -rw-r--r-- | src/particle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/particle.h b/src/particle.h index c360a5e94..7220ad258 100644 --- a/src/particle.h +++ b/src/particle.h @@ -111,7 +111,7 @@ class Particle : public Actor * Necessary for sorting with the other sprites. */ virtual int getPixelY() const - { return static_cast<int>(mPos.y) - 64; } + { return static_cast<int>(mPos.y) - 16; } /** * Creates a blank particle as a child of the current particle |