0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use case-insensitive sorting for MP Lobby player lists

Browse source
This commit is contained in:
Charles Dang 2017-10-14 11:52:03 +11:00
parent c63b1a2f2a
commit 4c9eab71d4
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/game_initialization/lobby_info.cpp
View file

@ -392,13 +392,19 @@ void lobby_info::sort_users(bool by_name, bool by_relation)
users_sorted_.push_back(&u);
}
// TODO: is this the simplest way to represent the sorting method?
std::sort(users_sorted_.begin(), users_sorted_.end(), [&](const user_info* u1, const user_info* u2) {
if(by_name && by_relation) {
return u1->relation < u2->relation || (u1->relation == u2->relation && u1->name < u2->name);
return u1->relation < u2->relation ||
(u1->relation == u2->relation && translation::icompare(u1->name, u2->name) < 0);
}
return (by_name ? u1->name < u2->name : true) && (by_relation ? u1->relation < u2->relation : true);
if(by_name) {
return translation::icompare(u1->name, u2->name) < 0;
}
if(by_relation) {
return u1->relation < u2->relation;
}
});
}