mirrors/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD synced 2026-01-26 05:34:12 +01:00
Code Issues Releases Wiki Activity

Codechange: HighScore sorting to use std::vector (#14779)

Browse Source 
Replaces the fixed-size array for company sorting with a std::vector and updates sorting to use std::ranges::sort. This removes the need for manual count management.
This commit is contained in:
SamuXarick
2025-11-15 21:40:36 +00:00
committed by GitHub
parent 05c40a6e55
commit 06d2f44891
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/highscore.cpp
View File

@@ -87,20 +87,19 @@ static bool HighScoreSorter(const Company * const &a, const Company * const &b)
*/
int8_t SaveHighScoreValueNetwork()
{
const Company *cl[MAX_COMPANIES];
size_t count = 0;
std::vector<const Company *> cl;
int8_t local_company_place = -1;
/* Sort all active companies with the highest score first */
for (const Company *c : Company::Iterate()) cl[count++] = c;
for (const Company *c : Company::Iterate()) cl.push_back(c);
std::sort(std::begin(cl), std::begin(cl) + count, HighScoreSorter);
std::ranges::sort(cl, HighScoreSorter);
/* Clear the high scores from the previous network game. */
auto &highscores = _highscore_table[SP_MULTIPLAYER];
std::fill(highscores.begin(), highscores.end(), HighScore{});
for (size_t i = 0; i < count && i < highscores.size(); i++) {
for (size_t i = 0; i < cl.size() && i < highscores.size(); i++) {
const Company *c = cl[i];
auto &highscore = highscores[i];
highscore.name = GetString(STR_HIGHSCORE_NAME, c->index, c->index); // get manager/company name string