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

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

Revision: 4922
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4922&view=rev
Author:   mbjornstk
Date:     2010-03-03 20:00:39 +0000 (Wed, 03 Mar 2010)

Log Message:
-----------
Report "plunger in face" hits with text. Band/pick mode not done yet.

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

Modified: main/trunk/src/items/flyable.cpp
===================================================================
--- main/trunk/src/items/flyable.cpp	2010-03-03 19:53:12 UTC (rev 4921)
+++ main/trunk/src/items/flyable.cpp	2010-03-03 20:00:39 UTC (rev 4922)
@@ -331,11 +331,7 @@
                                                          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();
+            case POWERUP_PLUNGER: // Handled by plunger.cpp Plunger::hit
             break;
             case POWERUP_BOWLING:
                 hit_message += StringUtils::insertValues(_("%s will not play bowling with %s again"),

Modified: main/trunk/src/items/plunger.cpp
===================================================================
--- main/trunk/src/items/plunger.cpp	2010-03-03 19:53:12 UTC (rev 4921)
+++ main/trunk/src/items/plunger.cpp	2010-03-03 20:00:39 UTC (rev 4922)
@@ -31,6 +31,7 @@
 #include "physics/physical_object.hpp"
 #include "tracks/track.hpp"
 #include "utils/constants.hpp"
+#include "utils/string_utils.hpp"
 
 // -----------------------------------------------------------------------------
 Plunger::Plunger(Kart *kart) : Flyable(kart, POWERUP_PLUNGER)
@@ -147,12 +148,20 @@
 {
     if(isOwnerImmunity(kart)) return;
 
+    RaceGUI* gui = World::getWorld()->getRaceGUI();
+    irr::core::stringw hit_message;
+
     // pulling back makes no sense in battle mode, since this mode is not a race.
     // so in battle mode, always hide view
     if( m_reverse_mode || race_manager->isBattleMode(race_manager->getMinorMode()) )
     {
         if(kart) kart->blockViewWithPlunger();
 
+        hit_message += StringUtils::insertValues(_("%s gets a fancy mask from %s"),
+                                                 kart->getName().c_str(),
+                                                 m_owner->getName().c_str()
+                                                ).c_str();
+
         m_keep_alive = 0;
         // Make this object invisible by placing it faaar down. Not that if this
         // objects is simply removed from the scene graph, it might be auto-deleted
@@ -160,6 +169,8 @@
         Vec3 hell(0, 0, -10000);
         getNode()->setPosition(hell.toIrrVector());
         World::getWorld()->getPhysics()->removeBody(getBody());
+
+        gui->addMessage(hit_message, NULL, 3.0f, 40, video::SColor(255, 210, 50, 50));
     }
     else
     {


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