From f48a82d2d4703bb614b2a1172c5170177d255733 Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Sun, 6 Feb 2011 23:44:17 +0000
Subject: [PATCH] fixed several failures of StringUtils::insert, I have no idea
 why they failed

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/items/flyable.cpp      | 10 +++++-----
 src/items/plunger.cpp      |  4 ++--
 src/items/rubber_band.cpp  |  4 ++--
 src/modes/linear_world.cpp |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/items/flyable.cpp b/src/items/flyable.cpp
index 632ee6240..9cd7da5fa 100644
--- a/src/items/flyable.cpp
+++ b/src/items/flyable.cpp
@@ -439,8 +439,8 @@ void Flyable::hit(Kart *kart_hit, PhysicalObject* object)
             case PowerupManager::POWERUP_CAKE:
             {
                 hit_message += StringUtils::insertValues(getCakeString(),
-                                                         kart_hit->getName(),
-                                                         m_owner->getName()
+                                                         core::stringw(kart_hit->getName()),
+                                                         core::stringw(m_owner->getName())
                                                         ).c_str();
             }
             break;
@@ -452,14 +452,14 @@ void Flyable::hit(Kart *kart_hit, PhysicalObject* object)
                 if (kart_hit == m_owner)
                 {
                     hit_message += StringUtils::insertValues(getSelfBowlingString(),
-                                                             m_owner->getName()
+                                                             core::stringw(m_owner->getName())
                                                             ).c_str();
                 }
                 else
                 {
                     hit_message += StringUtils::insertValues(getBowlingString(),
-                                                             kart_hit->getName(),
-                                                             m_owner->getName()
+                                                             core::stringw(kart_hit->getName()),
+                                                             core::stringw(m_owner->getName())
                                                             ).c_str();
                 }
             }
diff --git a/src/items/plunger.cpp b/src/items/plunger.cpp
index ad73cdd9d..d5e403f55 100644
--- a/src/items/plunger.cpp
+++ b/src/items/plunger.cpp
@@ -178,8 +178,8 @@ void Plunger::hit(Kart *kart, PhysicalObject *obj)
             kart->blockViewWithPlunger();
 
             hit_message += StringUtils::insertValues(getPlungerInFaceString(),
-                                                     kart->getName(),
-                                                     m_owner->getName()
+                                                     core::stringw(kart->getName()),
+                                                     core::stringw(m_owner->getName())
                                                     ).c_str();
             gui->addMessage(translations->fribidize(hit_message), NULL, 3.0f, 40, video::SColor(255, 255, 255, 255), false);
         }
diff --git a/src/items/rubber_band.cpp b/src/items/rubber_band.cpp
index 7e110b6ea..dd65e921e 100644
--- a/src/items/rubber_band.cpp
+++ b/src/items/rubber_band.cpp
@@ -249,8 +249,8 @@ void RubberBand::hit(Kart *kart_hit, const Vec3 *track_xyz)
         RaceGUIBase* gui = World::getWorld()->getRaceGUI();
         irr::core::stringw hit_message;
         hit_message += StringUtils::insertValues(getPlungerString(),
-                                                 kart_hit->getName(),
-                                                 m_owner->getName()
+                                                 core::stringw(kart_hit->getName()),
+                                                 core::stringw(m_owner->getName())
                                                 ).c_str();
         gui->addMessage(translations->fribidize(hit_message), NULL, 3.0f, 40, video::SColor(255, 255, 255, 255), false);
         return;
diff --git a/src/modes/linear_world.cpp b/src/modes/linear_world.cpp
index f0ee8cec1..8ecb55529 100644
--- a/src/modes/linear_world.cpp
+++ b/src/modes/linear_world.cpp
@@ -364,7 +364,7 @@ void LinearWorld::newLap(unsigned int kart_index)
 
             irr::core::stringw m_fastest_lap_message;
             //I18N: as in "fastest lap: 60 seconds by Wilber"
-            m_fastest_lap_message += _("%s by %s", s.c_str(), kart->getName());
+            m_fastest_lap_message += _("%s by %s", s.c_str(), core::stringw(kart->getName()));
 
             m_race_gui->addMessage(m_fastest_lap_message, NULL,
                                    2.0f, 40, video::SColor(255, 100, 210, 100));