miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Use std::swap() instead of Swap() (#13883)

Browse Source
This commit is contained in:
Peter Nelson
2025-03-24 23:47:34 +00:00
committed by GitHub
parent 8a53ccf8f1
commit 79ef4e98fe
17 changed files with 37 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/company_cmd.cpp
+3 -3
View File
@@ -476,14 +476,14 @@ static Colours GenerateCompanyColour()
/* And randomize it */
for (uint i = 0; i < 100; i++) {
uint r = Random();
Swap(colours[GB(r, 0, 4)], colours[GB(r, 4, 4)]);
std::swap(colours[GB(r, 0, 4)], colours[GB(r, 4, 4)]);
}
/* Bubble sort it according to the values in table 1 */
for (uint i = 0; i < COLOUR_END; i++) {
for (uint j = 1; j < COLOUR_END; j++) {
if (_colour_sort[colours[j - 1]] < _colour_sort[colours[j]]) {
Swap(colours[j - 1], colours[j]);
std::swap(colours[j - 1], colours[j]);
}
}
}
@@ -504,7 +504,7 @@ static Colours GenerateCompanyColour()
if (similar == INVALID_COLOUR) break;
for (uint i = 1; i < COLOUR_END; i++) {
if (colours[i - 1] == similar) Swap(colours[i - 1], colours[i]);
if (colours[i - 1] == similar) std::swap(colours[i - 1], colours[i]);
}
}
}