From 3c340572a59b71266bd73250f46fd475057bb3a7 Mon Sep 17 00:00:00 2001 From: Philipp Sehmisch Date: Wed, 11 Feb 2009 20:06:20 +0100 Subject: Restored particle effects on hits and critical hits. --- src/being.cpp | 17 ++--------------- src/net/beinghandler.cpp | 1 - 2 files changed, 2 insertions(+), 16 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) diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 0db8fcbf..d3ba4b03 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -33,7 +33,6 @@ #include "../localplayer.h" #include "../log.h" #include "../npc.h" -#include "../particle.h" #include "../player_relations.h" #include "../sound.h" -- cgit v1.2.3-70-g09d2