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

Removed calls to gettext in each frame, instead the tranlsation is only done once when

Browse Source 
the object is created.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2010-01-11 22:08:33 +00:00
parent f079754dee
commit 71616e256e
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/states_screens/race_gui.cpp
View File

@ -68,6 +68,16 @@ RaceGUI::RaceGUI()
m_plunger_face = material_manager->getMaterial("plungerface.png"); m_plunger_face = material_manager->getMaterial("plungerface.png");
m_music_icon = material_manager->getMaterial("notes.png"); m_music_icon = material_manager->getMaterial("notes.png");
createMarkerTexture(); createMarkerTexture();
// Translate strings only one in constructor to avoid calling
// gettext in each frame.
//I18N: Shown at the end of a race
m_string_finished = _("Finished");
m_string_lap = _("Lap");
//I18N: as in "ready, set, go", shown at the beginning of the race
m_string_ready = _("Ready!");
m_string_set = _("Set!");
m_string_go = _("Go!");
} // RaceGUI } // RaceGUI
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -585,19 +595,16 @@ void RaceGUI::drawLap(const KartIconDisplayInfo* info, Kart* kart,
if(kart->hasFinishedRace()) if(kart->hasFinishedRace())
{ {
static video::SColor color = video::SColor(255, 255, 255, 255); static video::SColor color = video::SColor(255, 255, 255, 255);
//I18N: Shown at the end of a race
core::stringw s=_("Finished");
pos.UpperLeftCorner.Y -= 2*font_height; pos.UpperLeftCorner.Y -= 2*font_height;
pos.LowerRightCorner = pos.UpperLeftCorner; pos.LowerRightCorner = pos.UpperLeftCorner;
font->draw(s.c_str(), pos, color); font->draw(m_string_finished.c_str(), pos, color);
} }
else else
{ {
static video::SColor color = video::SColor(255, 255, 255, 255); static video::SColor color = video::SColor(255, 255, 255, 255);
core::stringw s = _("Lap");
pos.UpperLeftCorner.Y -= 3*font_height; pos.UpperLeftCorner.Y -= 3*font_height;
pos.LowerRightCorner = pos.UpperLeftCorner; pos.LowerRightCorner = pos.UpperLeftCorner;
font->draw(core::stringw(_("Lap")).c_str(), pos, color); font->draw(m_string_lap.c_str(), pos, color);
char str[256]; char str[256];
sprintf(str, "%d/%d", lap+1, race_manager->getNumLaps()); sprintf(str, "%d/%d", lap+1, race_manager->getNumLaps());
@ -775,9 +782,7 @@ void RaceGUI::drawGlobalReadySetGo()
core::rect<s32> pos(UserConfigParams::m_width>>1, UserConfigParams::m_height>>1, core::rect<s32> pos(UserConfigParams::m_width>>1, UserConfigParams::m_height>>1,
UserConfigParams::m_width>>1, UserConfigParams::m_height>>1); UserConfigParams::m_width>>1, UserConfigParams::m_height>>1);
gui::IGUIFont* font = irr_driver->getRaceFont(); gui::IGUIFont* font = irr_driver->getRaceFont();
//I18N: as in "ready, set, go", shown at the beginning of the race font->draw(m_string_ready.c_str(), pos, color, true, true);
core::stringw s=_("Ready!");
font->draw(s.c_str(), pos, color, true, true);
} }
break; break;
case SET_PHASE: case SET_PHASE:
@ -787,8 +792,7 @@ void RaceGUI::drawGlobalReadySetGo()
UserConfigParams::m_width>>1, UserConfigParams::m_height>>1); UserConfigParams::m_width>>1, UserConfigParams::m_height>>1);
gui::IGUIFont* font = irr_driver->getRaceFont(); gui::IGUIFont* font = irr_driver->getRaceFont();
//I18N: as in "ready, set, go", shown at the beginning of the race //I18N: as in "ready, set, go", shown at the beginning of the race
core::stringw s=_("Set!"); font->draw(m_string_set.c_str(), pos, color, true, true);
font->draw(s.c_str(), pos, color, true, true);
} }
break; break;
case GO_PHASE: case GO_PHASE:
@ -798,8 +802,7 @@ void RaceGUI::drawGlobalReadySetGo()
UserConfigParams::m_width>>1, UserConfigParams::m_height>>1); UserConfigParams::m_width>>1, UserConfigParams::m_height>>1);
gui::IGUIFont* font = irr_driver->getRaceFont(); gui::IGUIFont* font = irr_driver->getRaceFont();
//I18N: as in "ready, set, go", shown at the beginning of the race //I18N: as in "ready, set, go", shown at the beginning of the race
core::stringw s=_("Go!"); font->draw(m_string_go.c_str(), pos, color, true, true);
font->draw(s.c_str(), pos, color, true, true);
} }
break; break;
default: default:

9
src/states_screens/race_gui.hpp
View File

@ -95,6 +95,15 @@ private:
/** Musical notes icon (for music description and credits) */ /** Musical notes icon (for music description and credits) */
Material *m_music_icon; Material *m_music_icon;
/** Translated string of 'finished' message. */
core::stringw m_string_finished;
/** Translated string 'lap' displayed every frame. */
core::stringw m_string_lap;
/** Translated strings 'ready', 'set', 'go'. */
core::stringw m_string_ready, m_string_set, m_string_go;
// Minimap related variables // Minimap related variables
// ------------------------- // -------------------------