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

Fix #3439

Browse Source
This commit is contained in:
Alayan 2018-09-17 03:46:20 +02:00
parent e269c5a72d
commit 02a3de4dd8
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/states_screens/race_gui_base.cpp
View File

@ -615,10 +615,10 @@ void RaceGUIBase::drawGlobalMusicDescription()
void RaceGUIBase::drawGlobalGoal() void RaceGUIBase::drawGlobalGoal()
{ {
static video::SColor color = video::SColor(255, 255, 255, 255); static video::SColor color = video::SColor(255, 255, 255, 255);
core::rect<s32> pos(irr_driver->getActualScreenSize().Width>>1, core::rect<s32> pos(irr_driver->getActualScreenSize().Width/2,
irr_driver->getActualScreenSize().Height>>1, irr_driver->getActualScreenSize().Height/2,
irr_driver->getActualScreenSize().Width>>1, irr_driver->getActualScreenSize().Width/2,
irr_driver->getActualScreenSize().Height>>1); irr_driver->getActualScreenSize().Height/2);
gui::IGUIFont* font = GUIEngine::getTitleFont(); gui::IGUIFont* font = GUIEngine::getTitleFont();
font->draw(m_string_goal.c_str(), pos, color, true, true); font->draw(m_string_goal.c_str(), pos, color, true, true);
} }
@ -627,52 +627,35 @@ void RaceGUIBase::drawGlobalGoal()
*/ */
void RaceGUIBase::drawGlobalReadySetGo() void RaceGUIBase::drawGlobalReadySetGo()
{ {
// This function is called only in a relevant phase,
// So we can put common elements here
static video::SColor color = video::SColor(255, 255, 255, 255);
gui::IGUIFont* font = GUIEngine::getTitleFont();
int x = irr_driver->getActualScreenSize().Width/2;
int y = irr_driver->getActualScreenSize().Height*2/5;
core::rect<s32> pos(x,y,x,y);
switch (World::getWorld()->getPhase()) switch (World::getWorld()->getPhase())
{ {
case WorldStatus::WAIT_FOR_SERVER_PHASE: case WorldStatus::WAIT_FOR_SERVER_PHASE:
{ {
static video::SColor color = video::SColor(255, 255, 255, 255);
core::rect<s32> pos(irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1,
irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1);
gui::IGUIFont* font = GUIEngine::getTitleFont();
font->draw(StringUtils::loadingDots( font->draw(StringUtils::loadingDots(
m_string_waiting_for_others.c_str()), pos, color, true, true); m_string_waiting_for_others.c_str()), pos, color, true, true);
} }
break; break;
case WorldStatus::READY_PHASE: case WorldStatus::READY_PHASE:
{ {
static video::SColor color = video::SColor(255, 255, 255, 255);
core::rect<s32> pos(irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1,
irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1);
gui::IGUIFont* font = GUIEngine::getTitleFont();
font->draw(m_string_ready.c_str(), pos, color, true, true); font->draw(m_string_ready.c_str(), pos, color, true, true);
} }
break; break;
case WorldStatus::SET_PHASE: case WorldStatus::SET_PHASE:
{ {
static video::SColor color = video::SColor(255, 255, 255, 255);
core::rect<s32> pos(irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1,
irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1);
gui::IGUIFont* font = GUIEngine::getTitleFont();
font->draw(m_string_set.c_str(), pos, color, true, true); font->draw(m_string_set.c_str(), pos, color, true, true);
} }
break; break;
case WorldStatus::GO_PHASE: case WorldStatus::GO_PHASE:
{ {
static video::SColor color = video::SColor(255, 255, 255, 255);
core::rect<s32> pos(irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1,
irr_driver->getActualScreenSize().Width>>1,
irr_driver->getActualScreenSize().Height>>1);
//gui::IGUIFont* font = irr_driver->getRaceFont();
gui::IGUIFont* font = GUIEngine::getTitleFont();
if (race_manager->getCoinTarget() > 0) if (race_manager->getCoinTarget() > 0)
font->draw(_("Collect nitro!"), pos, color, true, true); font->draw(_("Collect nitro!"), pos, color, true, true);
else if (race_manager->getMinorMode() == RaceManager::MINOR_MODE_FOLLOW_LEADER) else if (race_manager->getMinorMode() == RaceManager::MINOR_MODE_FOLLOW_LEADER)