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

Fix goal message crash and display bug

Browse Source
This commit is contained in:
Benau 2020-07-13 16:03:32 +08:00
parent 097359fcf4
commit da64f5eeab
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/modes/soccer_world.cpp
View File

@ -524,7 +524,8 @@ void SoccerWorld::onCheckGoalTriggered(bool first_goal)
msg = _("%s scored a goal!", sd.m_player);
else
msg = _("Oops, %s made an own goal!", sd.m_player);
m_race_gui->addMessage(msg, NULL, 3.0f);
if (m_race_gui)
m_race_gui->addMessage(msg, NULL, 3.0f);
#endif
if (first_goal)
@ -646,8 +647,12 @@ void SoccerWorld::handlePlayerGoalFromServer(const NetworkString& ns)
msg = _("%s scored a goal!", sd.m_player);
else
msg = _("Oops, %s made an own goal!", sd.m_player);
m_race_gui->addMessage(msg, NULL,
stk_config->ticks2Time(ticks_back_to_own_goal - ticks_now));
float time = stk_config->ticks2Time(ticks_back_to_own_goal - ticks_now);
// May happen if this message is added when spectate started
if (time > 3.0f)
time = 3.0f;
if (m_race_gui)
m_race_gui->addMessage(msg, NULL, time);
m_ticks_back_to_own_goal = ticks_back_to_own_goal;
for (unsigned i = 0; i < m_karts.size(); i++)