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

Fix wrong lap count in GP result

Browse Source
This commit is contained in:
mrkubax10 2022-01-26 12:37:13 +01:00
parent 01a78ba594
commit b80df76116
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/states_screens/race_result_gui.cpp
View File

@ -909,6 +909,7 @@ void RaceResultGUI::unload()
ri->m_finish_time_string += StringUtils::toWString(ranking_change); ri->m_finish_time_string += StringUtils::toWString(ranking_change);
} }
} }
ri->m_laps = World::getWorld()->getFinishedLapsOfKart(ri->m_kart_id);
core::dimension2du rect = core::dimension2du rect =
m_font->getDimension(ri->m_kart_name.c_str()); m_font->getDimension(ri->m_kart_name.c_str());
@ -1364,6 +1365,7 @@ void RaceResultGUI::unload()
int p = RaceManager::get()->getKartScore(i); int p = RaceManager::get()->getKartScore(i);
ri->m_new_overall_points = p; ri->m_new_overall_points = p;
ri->m_new_gp_rank = gp_position; ri->m_new_gp_rank = gp_position;
ri->m_laps = World::getWorld()->getFinishedLapsOfKart(i);
} // i < num_karts } // i < num_karts
#endif #endif
} // determineGPLayout } // determineGPLayout
@ -1442,20 +1444,20 @@ void RaceResultGUI::unload()
true /* ignoreRTL */); true /* ignoreRTL */);
current_x += m_width_kart_name + m_width_column_space; current_x += m_width_kart_name + m_width_column_space;
if (!RaceManager::get()->isLapTrialMode()) if (RaceManager::get()->isLapTrialMode())
{
core::recti pos_laps = core::recti(current_x, y, current_x + 100, y + 10);
m_font->draw(irr::core::stringw(ri->m_laps), pos_laps, color, false, false,
NULL, true /* ignoreRTL */);
}
else
{ {
core::recti dest_rect = core::recti(current_x, y, current_x + 100, y + 10); core::recti dest_rect = core::recti(current_x, y, current_x + 100, y + 10);
m_font->draw(ri->m_finish_time_string, dest_rect, color, false, false, m_font->draw(ri->m_finish_time_string, dest_rect, color, false, false,
NULL, true /* ignoreRTL */); NULL, true /* ignoreRTL */);
current_x += m_width_finish_time + m_width_column_space; current_x += m_width_finish_time + m_width_column_space;
} }
if (RaceManager::get()->isLapTrialMode())
{
core::recti pos_laps = core::recti(current_x, y, current_x + 100, y + 10);
int laps = World::getWorld()->getFinishedLapsOfKart(ri->m_kart_id);
m_font->draw(irr::core::stringw(laps), pos_laps, color, false, false,
NULL, true /* ignoreRTL */);
}
current_x += 100 + m_width_column_space; current_x += 100 + m_width_column_space;

2
src/states_screens/race_result_gui.hpp
View File

@ -109,6 +109,8 @@ private:
core::stringw m_finish_time_string; core::stringw m_finish_time_string;
/** The kart color */ /** The kart color */
float m_kart_color; float m_kart_color;
/** Number of laps that kart finished */
unsigned int m_laps;
}; // Rowinfo }; // Rowinfo
/** The team icons. */ /** The team icons. */