[Supertuxkart-commit] SF.net SVN: supertuxkart:[4902] main/trunk/src/items

[<mbj...@us...>]

Revision: 4902
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4902&view=rev
Author:   mbjornstk
Date:     2010-03-02 02:07:36 +0000 (Tue, 02 Mar 2010)

Log Message:
-----------
Report hits of cakes and balls with message. Plunger fails for now.

Modified Paths:
--------------
    main/trunk/src/items/flyable.cpp
    main/trunk/src/items/flyable.hpp

Modified: main/trunk/src/items/flyable.cpp
===================================================================
--- main/trunk/src/items/flyable.cpp	2010-03-02 02:05:56 UTC (rev 4901)
+++ main/trunk/src/items/flyable.cpp	2010-03-02 02:07:36 UTC (rev 4902)
@@ -33,6 +33,7 @@
 #include "network/flyable_info.hpp"
 #include "tracks/track.hpp"
 #include "utils/constants.hpp"
+#include "utils/string_utils.hpp"
 
 // static variables:
 float         Flyable::m_st_speed[POWERUP_MAX];
@@ -54,6 +55,7 @@
     m_force_updown      = m_st_force_updown[type];
 
     m_owner             = kart;
+    m_type              = type;
     m_has_hit_something = false;
     m_exploded          = false;
     m_shape             = NULL;
@@ -318,6 +320,35 @@
     // the owner of this flyable should not be hit by his own flyable
     if(m_exploded || isOwnerImmunity(kart_hit)) return;
 
+    if (kart_hit != NULL)
+    {
+        RaceGUI* gui = World::getWorld()->getRaceGUI();
+        irr::core::stringw hit_message;
+        switch(m_type) {
+            case POWERUP_CAKE:
+                hit_message += StringUtils::insertValues(_("%s eats too much %s's cake"),
+                                                         kart_hit->getName().c_str(),
+                                                         m_owner->getName().c_str()
+                                                        ).c_str();
+            break;
+            case POWERUP_PLUNGER: // FIXME, this one never appears, maybe wrong place to handle
+                hit_message += StringUtils::insertValues(_("%s gets a fancy mask from %s"),
+                                                         kart_hit->getName().c_str(),
+                                                         m_owner->getName().c_str()
+                                                        ).c_str();
+            break;
+            case POWERUP_BOWLING:
+                hit_message += StringUtils::insertValues(_("%s will not play bowling with %s again"),
+                                                         kart_hit->getName().c_str(),
+                                                         m_owner->getName().c_str()
+                                                        ).c_str();
+            break;
+            default:
+                hit_message = _("UFO hit someone, the bug is right here");
+        }
+        gui->addMessage(hit_message, NULL, 3.0f, 40, video::SColor(255, 210, 50, 50));
+    }
+
     m_has_hit_something=true;
     // Notify the projectile manager that this rocket has hit something.
     // The manager will create the appropriate explosion object.

Modified: main/trunk/src/items/flyable.hpp
===================================================================
--- main/trunk/src/items/flyable.hpp	2010-03-02 02:05:56 UTC (rev 4901)
+++ main/trunk/src/items/flyable.hpp	2010-03-02 02:07:36 UTC (rev 4902)
@@ -52,6 +52,7 @@
 
 protected:
     Kart*             m_owner;              // the kart which released this flyable
+    PowerupType       m_type;               // cake, ball, etc
     btCollisionShape *m_shape;
     float             m_max_height;
     float             m_min_height;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.