diff options
| author | David Athay <ko2fan@gmail.com> | 2009-02-11 22:17:47 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2009-02-11 22:17:47 +0000 |
| commit | 5e01985ee82007307c96f900057679485b977196 (patch) | |
| tree | 818ee5c5ae3b02708c0fe5d75aad1ef25906e3f4 /src/being.cpp | |
| parent | 91111ca5d13072ea3b834e23835df9c077329e39 (diff) | |
| parent | 7b007058afab8ea920a5d60b31f45958e5622878 (diff) | |
| download | mana-5e01985ee82007307c96f900057679485b977196.tar.gz mana-5e01985ee82007307c96f900057679485b977196.tar.bz2 mana-5e01985ee82007307c96f900057679485b977196.tar.xz mana-5e01985ee82007307c96f900057679485b977196.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'src/being.cpp')
| -rw-r--r-- | src/being.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/being.cpp b/src/being.cpp index 0ccf675c..dcb45a9d 100644 --- a/src/being.cpp +++ b/src/being.cpp @@ -250,26 +250,13 @@ void Being::takeDamage(int amount) // Show damage number particleEngine->addTextSplashEffect(damage, 255, 255, 255, font, mPx + 16, mPy + 16); + effectManager->trigger(26, this); } void Being::showCrit() { - gcn::Font *font; - std::string text = "crit!"; + effectManager->trigger(28, this); - // Selecting the right color - if (getType() == MONSTER) - { - font = hitBlueFont; - } - else - { - font = hitRedFont; - } - - // Show crit notice - particleEngine->addTextSplashEffect(text, 255, 255, 255, font, - mPx + 16, mPy + 16); } void Being::handleAttack(Being *victim, int damage) |