Merge branch 'Flakebi-clang-fix'

This commit is contained in:
hiker 2015-02-08 22:24:05 +11:00
commit 08493448be

View File

@ -349,10 +349,13 @@ void LinearWorld::newLap(unsigned int kart_index)
std::string s = StringUtils::timeToString(time_per_lap);
irr::core::stringw m_fastest_lap_message;
// Store the temporary string because clang would mess this up
// (remove the stringw before the wchar_t* is used).
const core::stringw &kart_name = kart->getName();
//I18N: as in "fastest lap: 60 seconds by Wilber"
m_fastest_lap_message += _C("fastest_lap", "%s by %s", s.c_str(),
core::stringw(kart->getName()));
irr::core::stringw m_fastest_lap_message =
_C("fastest_lap", "%s by %s", s.c_str(), kart_name);
m_race_gui->addMessage(m_fastest_lap_message, NULL,
3.0f, video::SColor(255, 255, 255, 255), false);