ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed several failures of StringUtils::insert, I have no idea why they failed

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
auria 2011-02-06 23:44:17 +00:00
parent f38c825566
commit f48a82d2d4
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/items/flyable.cpp
View File

@ -439,8 +439,8 @@ void Flyable::hit(Kart *kart_hit, PhysicalObject* object)
case PowerupManager::POWERUP_CAKE: case PowerupManager::POWERUP_CAKE:
{ {
hit_message += StringUtils::insertValues(getCakeString(), hit_message += StringUtils::insertValues(getCakeString(),
kart_hit->getName(), core::stringw(kart_hit->getName()),
m_owner->getName() core::stringw(m_owner->getName())
).c_str(); ).c_str();
} }
break; break;
@ -452,14 +452,14 @@ void Flyable::hit(Kart *kart_hit, PhysicalObject* object)
if (kart_hit == m_owner) if (kart_hit == m_owner)
{ {
hit_message += StringUtils::insertValues(getSelfBowlingString(), hit_message += StringUtils::insertValues(getSelfBowlingString(),
m_owner->getName() core::stringw(m_owner->getName())
).c_str(); ).c_str();
} }
else else
{ {
hit_message += StringUtils::insertValues(getBowlingString(), hit_message += StringUtils::insertValues(getBowlingString(),
kart_hit->getName(), core::stringw(kart_hit->getName()),
m_owner->getName() core::stringw(m_owner->getName())
).c_str(); ).c_str();
} }
} }

4
src/items/plunger.cpp
View File

@ -178,8 +178,8 @@ void Plunger::hit(Kart *kart, PhysicalObject *obj)
kart->blockViewWithPlunger(); kart->blockViewWithPlunger();
hit_message += StringUtils::insertValues(getPlungerInFaceString(), hit_message += StringUtils::insertValues(getPlungerInFaceString(),
kart->getName(), core::stringw(kart->getName()),
m_owner->getName() core::stringw(m_owner->getName())
).c_str(); ).c_str();
gui->addMessage(translations->fribidize(hit_message), NULL, 3.0f, 40, video::SColor(255, 255, 255, 255), false); gui->addMessage(translations->fribidize(hit_message), NULL, 3.0f, 40, video::SColor(255, 255, 255, 255), false);
} }

4
src/items/rubber_band.cpp
View File

@ -249,8 +249,8 @@ void RubberBand::hit(Kart *kart_hit, const Vec3 *track_xyz)
RaceGUIBase* gui = World::getWorld()->getRaceGUI(); RaceGUIBase* gui = World::getWorld()->getRaceGUI();
irr::core::stringw hit_message; irr::core::stringw hit_message;
hit_message += StringUtils::insertValues(getPlungerString(), hit_message += StringUtils::insertValues(getPlungerString(),
kart_hit->getName(), core::stringw(kart_hit->getName()),
m_owner->getName() core::stringw(m_owner->getName())
).c_str(); ).c_str();
gui->addMessage(translations->fribidize(hit_message), NULL, 3.0f, 40, video::SColor(255, 255, 255, 255), false); gui->addMessage(translations->fribidize(hit_message), NULL, 3.0f, 40, video::SColor(255, 255, 255, 255), false);
return; return;

2
src/modes/linear_world.cpp
View File

@ -364,7 +364,7 @@ void LinearWorld::newLap(unsigned int kart_index)
irr::core::stringw m_fastest_lap_message; irr::core::stringw m_fastest_lap_message;
//I18N: as in "fastest lap: 60 seconds by Wilber" //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, m_race_gui->addMessage(m_fastest_lap_message, NULL,
2.0f, 40, video::SColor(255, 100, 210, 100)); 2.0f, 40, video::SColor(255, 100, 210, 100));