From 29e7e574fc9f0c650322c2f0e443d20f43ac247b Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Fri, 20 Oct 2017 16:08:46 +1100 Subject: [PATCH] Lobby Info: simplified player list sorting code by @Ja-MiT --- src/game_initialization/lobby_info.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/game_initialization/lobby_info.cpp b/src/game_initialization/lobby_info.cpp index 3e0fee4ac771..f60e5127ba70 100644 --- a/src/game_initialization/lobby_info.cpp +++ b/src/game_initialization/lobby_info.cpp @@ -398,15 +398,7 @@ void lobby_info::sort_users(bool by_name, bool by_relation) (u1->relation == u2->relation && translation::icompare(u1->name, u2->name) < 0); } - if(by_name) { - return translation::icompare(u1->name, u2->name) < 0; - } - - if(by_relation) { - return u1->relation < u2->relation; - } - - return true; + return (by_name && translation::icompare(u1->name, u2->name) < 0) || (by_relation && u1->relation < u2->relation); }); }