From c22fc71adacaf6222f7e6fb70f83758298f25904 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Fri, 31 Oct 2008 04:05:51 +0000
Subject: Added critical notifications to the client. While I had originally
 planned to do this (I still did it my way), TMW beat me to implementing, so
 I'll credit them with their commit reminding me to do it. This is not done
 the exact same way, as I prefer to see an actual "crit!" show above the
 being, instead of an ambiguous particle.

---
 src/being.cpp            | 24 ++++++++++++++++++++----
 src/being.h              |  5 +++++
 src/gui/gui.cpp          |  4 ++--
 src/net/beinghandler.cpp |  5 ++++-
 4 files changed, 31 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/being.cpp b/src/being.cpp
index 19c2224d..3214b491 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -189,10 +189,6 @@ void Being::takeDamage(int amount)
     }
     else
     {
-        // Hit particle effect
-        controlParticle(particleEngine->addEffect(
-                    "graphics/particles/hit.particle.xml", 0, 0));
-
         if (getType() == MONSTER)
         {
             font = hitBlueFont;
@@ -208,6 +204,26 @@ void Being::takeDamage(int amount)
                                         mPx + 16, mPy + 16);
 }
 
+void Being::showCrit()
+{
+    gcn::Font *font;
+    std::string text = "crit!";
+
+    // Selecting the right color
+    if (getType() == MONSTER)
+    {
+        font = hitBlueFont;
+    }
+    else
+    {
+        font = hitRedFont;
+    }
+
+    // Show crit notice
+    particleEngine->addTextRiseFadeOutEffect(text, font,
+                                             mPx + 16, mPy - 16);
+}
+
 void Being::handleAttack(Being *victim, int damage)
 {
     setAction(Being::ATTACK);
diff --git a/src/being.h b/src/being.h
index b0c5b49e..62a1c937 100644
--- a/src/being.h
+++ b/src/being.h
@@ -165,6 +165,11 @@ class Being : public Sprite
          */
         virtual void takeDamage(int amount);
 
+        /**
+         * Puts a crit notification bubble above this being.
+         */
+        virtual void showCrit();
+
         /**
          * Handles an attack of another being by this being.
          *
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index edc25152..6d70d532 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -180,9 +180,9 @@ Gui::Gui(Graphics *graphics):
     // Load hits' colourful fonts
     try {
         hitRedFont = new gcn::ImageFont("graphics/gui/hits_red.png",
-                "0123456789");
+                "0123456789crit! ");
         hitBlueFont = new gcn::ImageFont("graphics/gui/hits_blue.png",
-                "0123456789");
+                "0123456789crit! ");
         hitYellowFont = new gcn::ImageFont("graphics/gui/hits_yellow.png",
                 "0123456789misxp ");
     }
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index baca0cfc..85e18e5a 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -237,8 +237,11 @@ void BeingHandler::handleMessage(MessageIn *msg)
 
             switch (type)
             {
-                case 0x00: // Damage
                 case 0x0a: // Critical Damage
+                    if (dstBeing) {
+                         dstBeing->showCrit();
+                    }
+               case 0x00: // Damage
                     if (dstBeing) {
                         dstBeing->takeDamage(param1);
                     }
-- 
cgit v1.2.3-70-g09d2