Merge branch 'aethyra/master'

Conflicts:
	data/graphics/images/login_wallpaper.png
	src/being.cpp
	src/beingmanager.cpp
	src/engine.cpp
	src/game.cpp
	src/gui/buysell.cpp
	src/gui/buysell.h
	src/gui/gui.h
	src/gui/npc_text.cpp
	src/gui/npc_text.h
	src/gui/npcintegerdialog.cpp
	src/gui/npclistdialog.cpp
	src/gui/npclistdialog.h
	src/gui/npcstringdialog.cpp
	src/gui/sell.cpp
	src/gui/shop.cpp
	src/gui/table.cpp
	src/net/beinghandler.cpp
	src/net/npchandler.cpp
	src/net/playerhandler.cpp
	src/npc.cpp
	src/npc.h
	src/shopitem.cpp
	src/shopitem.h
	src/utils/stringutils.cpp
	src/utils/stringutils.h
	src/utils/trim.h

1 files changed, 21 insertions, 5 deletions

diff --git a/src/being.cpp b/src/being.cpp
index 43480eba..902bd4e1 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -232,20 +232,36 @@ void Being::takeDamage(int amount)
     gcn::Font *font;
     std::string damage = amount ? toString(amount) : "miss";
 
+    int red, green, blue;
+
+    font = gui->getInfoParticleFont();
+
     // Selecting the right color
     if (damage == "miss")
-        font = hitYellowFont;
+    {
+        red = 255;
+        green = 255;
+        blue = 0;
+    }
     else
     {
         if (getType() == MONSTER)
-            font = hitBlueFont;
+        {
+            red = 0;
+            green = 100;
+            blue = 255;
+        }
         else
-            font = hitRedFont;
+        {
+            red = 255;
+            green = 50;
+            blue = 50;
+        }
     }
 
     // Show damage number
-    particleEngine->addTextSplashEffect(damage, 255, 255, 255, font,
-                                        mPx + 16, mPy + 16);
+    particleEngine->addTextSplashEffect(damage, red, green, blue, font,
+                                        mPx + 16, mPy + 16, true);
     effectManager->trigger(26, this);
 }