summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Friis <peavey@inspircd.org>2009-05-17 01:57:50 +0200
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-17 22:21:24 +0200
commitb86b23225eedc5ca7fe313cc6485138e1f69cadb (patch)
tree9202734f59b80230b374c1b446847e12b4a941ce
parent7657ec87dcae8dd12186c65448cb6fe743849e4d (diff)
downloadmana-b86b23225eedc5ca7fe313cc6485138e1f69cadb.tar.gz
mana-b86b23225eedc5ca7fe313cc6485138e1f69cadb.tar.bz2
mana-b86b23225eedc5ca7fe313cc6485138e1f69cadb.tar.xz
mana-b86b23225eedc5ca7fe313cc6485138e1f69cadb.zip
Fix offsets (16,32) on TextEffects for damage, pickup and exp.
(cherry picked from commit 98eadea1f98f76237701d2ac44868847a18d13c2)
-rw-r--r--src/being.cpp2
-rw-r--r--src/localplayer.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/being.cpp b/src/being.cpp
index 2b31e9ec..37cb6987 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -448,7 +448,7 @@ void Being::takeDamage(Being *attacker, int amount, AttackType type)
// Show damage number
particleEngine->addTextSplashEffect(damage,
- mPx + 16, mPy + 16,
+ mPx, mPy - 16,
color, font, true);
if (amount > 0)
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 7119bfc9..650de182 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -812,8 +812,8 @@ void LocalPlayer::setXp(int xp)
// Show XP number
particleEngine->addTextRiseFadeOutEffect(
text,
- getPixelX() + 16,
- getPixelY() - 16,
+ getPixelX(),
+ getPixelY() - 48,
&guiPalette->getColor(Palette::EXP_INFO),
gui->getInfoParticleFont(), true);
}
@@ -829,8 +829,8 @@ void LocalPlayer::pickedUp(const std::string &item)
// Show pickup notification
particleEngine->addTextRiseFadeOutEffect(
item,
- getPixelX() + 16,
- getPixelY() - 16,
+ getPixelX(),
+ getPixelY() - 48,
&guiPalette->getColor(Palette::PICKUP_INFO),
gui->getInfoParticleFont(), true);
}