From 0b7d7027e1ba50e79facc4bed06f8395363c72b6 Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Mon, 13 May 2019 19:53:33 +0100 Subject: [PATCH] Fix formatting --- src/openrct2-ui/windows/Multiplayer.cpp | 7 +++---- src/openrct2/actions/NetworkModifyGroupAction.hpp | 4 +++- src/openrct2/network/Network.cpp | 9 +++++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/openrct2-ui/windows/Multiplayer.cpp b/src/openrct2-ui/windows/Multiplayer.cpp index de0d4f77f5..00fc390038 100644 --- a/src/openrct2-ui/windows/Multiplayer.cpp +++ b/src/openrct2-ui/windows/Multiplayer.cpp @@ -847,7 +847,8 @@ static void window_multiplayer_groups_scrollmousedown(rct_window* w, int32_t scr w->selected_list_item = index; window_invalidate(w); - auto networkModifyGroup = NetworkModifyGroupAction(ModifyGroupType::SetPermissions, _selectedGroup, "", index, PermissionState::Toggle); + auto networkModifyGroup = NetworkModifyGroupAction( + ModifyGroupType::SetPermissions, _selectedGroup, "", index, PermissionState::Toggle); GameActions::Execute(&networkModifyGroup); } @@ -871,9 +872,7 @@ static void window_multiplayer_groups_text_input(rct_window* w, rct_widgetindex if (text == nullptr) return; - - auto networkModifyGroup = NetworkModifyGroupAction( - ModifyGroupType::SetName, _selectedGroup, text); + auto networkModifyGroup = NetworkModifyGroupAction(ModifyGroupType::SetName, _selectedGroup, text); GameActions::Execute(&networkModifyGroup); } diff --git a/src/openrct2/actions/NetworkModifyGroupAction.hpp b/src/openrct2/actions/NetworkModifyGroupAction.hpp index 780b5949e3..f8185d605d 100644 --- a/src/openrct2/actions/NetworkModifyGroupAction.hpp +++ b/src/openrct2/actions/NetworkModifyGroupAction.hpp @@ -42,7 +42,9 @@ private: public: NetworkModifyGroupAction() = default; - NetworkModifyGroupAction(ModifyGroupType type, uint8_t groupId = std::numeric_limits::max(), const std::string name = "", uint32_t permissionIndex = 0, PermissionState permissionState = PermissionState::Count ) + NetworkModifyGroupAction( + ModifyGroupType type, uint8_t groupId = std::numeric_limits::max(), const std::string name = "", + uint32_t permissionIndex = 0, PermissionState permissionState = PermissionState::Count) : _type(static_cast(type)) , _groupId(groupId) , _name(name) diff --git a/src/openrct2/network/Network.cpp b/src/openrct2/network/Network.cpp index 7a68d6ba24..59bd4d4974 100644 --- a/src/openrct2/network/Network.cpp +++ b/src/openrct2/network/Network.cpp @@ -3664,11 +3664,12 @@ GameActionResult::Ptr network_modify_groups( { return std::make_unique(GA_ERROR::DISALLOWED, STR_THIS_GROUP_CANNOT_BE_MODIFIED); } - for (const auto &it : gNetwork.player_list) + for (const auto& it : gNetwork.player_list) { if ((it.get())->Group == groupId) { - return std::make_unique(GA_ERROR::DISALLOWED, STR_CANT_REMOVE_GROUP_THAT_PLAYERS_BELONG_TO); + return std::make_unique( + GA_ERROR::DISALLOWED, STR_CANT_REMOVE_GROUP_THAT_PLAYERS_BELONG_TO); } } if (isExecuting) @@ -3758,6 +3759,10 @@ GameActionResult::Ptr network_modify_groups( } } break; + default: + log_error("Invalid Modify Group Type: %u", static_cast(type)); + return std::make_unique(GA_ERROR::INVALID_PARAMETERS, STR_NONE); + break; } gNetwork.SaveGroups();