From ff11c846b8a4c672874a1d5e624d257a92d56694 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Fri, 11 Dec 2020 16:29:35 +1100 Subject: [PATCH] GCC I've come to bargain --- src/game_initialization/lobby_data.cpp | 20 ++++++++++---------- src/game_initialization/lobby_data.hpp | 8 ++++---- src/game_initialization/lobby_info.cpp | 4 ++-- src/gui/dialogs/multiplayer/lobby.cpp | 16 ++++++++-------- src/gui/dialogs/multiplayer/player_info.cpp | 16 ++++++++-------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/game_initialization/lobby_data.cpp b/src/game_initialization/lobby_data.cpp index 760a70f91ec..d976f102de2 100644 --- a/src/game_initialization/lobby_data.cpp +++ b/src/game_initialization/lobby_data.cpp @@ -110,8 +110,8 @@ void room_info::process_room_members(const config& data) user_info::user_info(const config& c) : name(c["name"]) , game_id(c["game_id"]) - , relation(relation::ME) - , state(game_id == 0 ? state::LOBBY : state::GAME) + , relation(user_relation::ME) + , state(game_id == 0 ? user_state::LOBBY : user_state::GAME) , registered(c["registered"].to_bool()) , observing(c["status"] == "observing") , moderator(c["moderator"].to_bool(false)) @@ -124,15 +124,15 @@ void user_info::update_state(int selected_game_id, { if(game_id != 0) { if(game_id == selected_game_id) { - state = state::SEL_GAME; + state = user_state::SEL_GAME; } else { - state = state::GAME; + state = user_state::GAME; } } else { if(current_room != nullptr && current_room->is_member(name)) { - state = state::SEL_ROOM; + state = user_state::SEL_ROOM; } else { - state = state::LOBBY; + state = user_state::LOBBY; } } update_relation(); @@ -141,13 +141,13 @@ void user_info::update_state(int selected_game_id, void user_info::update_relation() { if(name == preferences::login()) { - relation = relation::ME; + relation = user_relation::ME; } else if(preferences::is_ignored(name)) { - relation = relation::IGNORED; + relation = user_relation::IGNORED; } else if(preferences::is_friend(name)) { - relation = relation::FRIEND; + relation = user_relation::FRIEND; } else { - relation = relation::NEUTRAL; + relation = user_relation::NEUTRAL; } } diff --git a/src/game_initialization/lobby_data.hpp b/src/game_initialization/lobby_data.hpp index 42ace9ae77a..2dc2a1412b7 100644 --- a/src/game_initialization/lobby_data.hpp +++ b/src/game_initialization/lobby_data.hpp @@ -109,14 +109,14 @@ struct user_info void update_relation(); - enum class relation { + enum class user_relation { ME, FRIEND, NEUTRAL, IGNORED }; - enum class state { + enum class user_state { LOBBY, SEL_ROOM, GAME, @@ -127,8 +127,8 @@ struct user_info std::string name; int game_id; - relation relation; - state state; + user_relation relation; + user_state state; bool registered; bool observing; bool moderator; diff --git a/src/game_initialization/lobby_info.cpp b/src/game_initialization/lobby_info.cpp index e7204e64783..c14c5e193f1 100644 --- a/src/game_initialization/lobby_info.cpp +++ b/src/game_initialization/lobby_info.cpp @@ -237,10 +237,10 @@ void lobby_info::process_userlist() } switch(ui.relation) { - case user_info::relation::FRIEND: + case user_info::user_relation::FRIEND: g->has_friends = true; break; - case user_info::relation::IGNORED: + case user_info::user_relation::IGNORED: g->has_ignored = true; break; default: diff --git a/src/gui/dialogs/multiplayer/lobby.cpp b/src/gui/dialogs/multiplayer/lobby.cpp index 5341b136f4e..62fe20ea609 100644 --- a/src/gui/dialogs/multiplayer/lobby.cpp +++ b/src/gui/dialogs/multiplayer/lobby.cpp @@ -601,7 +601,7 @@ void mp_lobby::update_playerlist() icon_ss << "lobby/status"; switch(user.state) { #ifdef ENABLE_ROOM_MEMBER_TREE - case mp::user_info::state::SEL_ROOM: + case mp::user_info::user_state::SEL_ROOM: icon_ss << "-lobby"; target_list = &player_list_.active_room; if(lobby) { @@ -609,16 +609,16 @@ void mp_lobby::update_playerlist() } break; #endif - case mp::user_info::state::LOBBY: + case mp::user_info::user_state::LOBBY: icon_ss << "-lobby"; target_list = &player_list_.other_rooms; break; - case mp::user_info::state::SEL_GAME: + case mp::user_info::user_state::SEL_GAME: name = colorize(name, {0, 255, 255}); icon_ss << (user.observing ? "-obs" : "-playing"); target_list = &player_list_.active_game; break; - case mp::user_info::state::GAME: + case mp::user_info::user_state::GAME: name = colorize(name, font::BAD_COLOR); icon_ss << (user.observing ? "-obs" : "-playing"); target_list = &player_list_.other_games; @@ -629,16 +629,16 @@ void mp_lobby::update_playerlist() } switch(user.relation) { - case mp::user_info::relation::ME: + case mp::user_info::user_relation::ME: icon_ss << "-s"; break; - case mp::user_info::relation::NEUTRAL: + case mp::user_info::user_relation::NEUTRAL: icon_ss << "-n"; break; - case mp::user_info::relation::FRIEND: + case mp::user_info::user_relation::FRIEND: icon_ss << "-f"; break; - case mp::user_info::relation::IGNORED: + case mp::user_info::user_relation::IGNORED: icon_ss << "-i"; break; default: diff --git a/src/gui/dialogs/multiplayer/player_info.cpp b/src/gui/dialogs/multiplayer/player_info.cpp index f339f4ddb13..ef3746879e7 100644 --- a/src/gui/dialogs/multiplayer/player_info.cpp +++ b/src/gui/dialogs/multiplayer/player_info.cpp @@ -59,7 +59,7 @@ void lobby_player_info::pre_show(window& window) relation_ = find_widget