diff --git a/src/citra_qt/multiplayer/host_room.cpp b/src/citra_qt/multiplayer/host_room.cpp index 2f27ee099..5f29eed2d 100644 --- a/src/citra_qt/multiplayer/host_room.cpp +++ b/src/citra_qt/multiplayer/host_room.cpp @@ -144,8 +144,8 @@ void HostRoomWindow::Host() { bool created = room->Create(ui->room_name->text().toStdString(), ui->room_description->toPlainText().toStdString(), "", static_cast(port), password, ui->max_player->value(), - ui->username->text().toStdString(),, game_name.toStdString(), - game_id, CreateVerifyBackend(is_public), ban_list, true); + ui->username->text().toStdString(), game_name.toStdString(), + game_id, CreateVerifyBackend(is_public), ban_list); if (!created) { NetworkMessage::ErrorManager::ShowError( NetworkMessage::ErrorManager::COULD_NOT_CREATE_ROOM); diff --git a/src/citra_room/citra_room.cpp b/src/citra_room/citra_room.cpp index 006efbc94..7e32be303 100644 --- a/src/citra_room/citra_room.cpp +++ b/src/citra_room/citra_room.cpp @@ -183,7 +183,6 @@ void LaunchRoom(int argc, char** argv, bool called_by_option) { u64 preferred_game_id = 0; u16 port = Network::DefaultRoomPort; u32 max_members = 16; - bool enable_citra_mods = false; static struct option long_options[] = { {"room-name", required_argument, 0, 'n'}, @@ -250,9 +249,6 @@ void LaunchRoom(int argc, char** argv, bool called_by_option) { case 'l': log_file.assign(optarg); break; - case 'e': - enable_citra_mods = true; - break; case 'h': PrintHelp(argv[0]); exit(0); @@ -324,10 +320,6 @@ void LaunchRoom(int argc, char** argv, bool called_by_option) { NetSettings::values.citra_token = token; } } - if (!announce && enable_citra_mods) { - enable_citra_mods = false; - std::cout << "Can not enable Citra Moderators for private rooms\n\n"; - } InitializeLogging(log_file); @@ -354,8 +346,7 @@ void LaunchRoom(int argc, char** argv, bool called_by_option) { Network::Init(); if (std::shared_ptr room = Network::GetRoom().lock()) { if (!room->Create(room_name, room_description, "", port, password, max_members, username, - preferred_game, preferred_game_id, std::move(verify_backend), ban_list, - enable_citra_mods)) { + preferred_game, preferred_game_id, std::move(verify_backend), ban_list)) { std::cout << "Failed to create room: \n\n"; exit(-1); } diff --git a/src/network/room.cpp b/src/network/room.cpp index 7f431dd9a..f2a0925c3 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -373,13 +373,11 @@ void Room::RoomImpl::HandleJoinRequest(const ENetEvent* event) { } member.user_data = verify_backend->LoadUserData(uid, token); - if (nickname == room_information.host_username) { member.user_data.moderator = true; LOG_INFO(Network, "User {} is a moderator", std::string(room_information.host_username)); } - std::string ip; { std::lock_guard lock(ban_list_mutex); @@ -605,8 +603,7 @@ bool Room::RoomImpl::HasModPermission(const ENetPeer* client) const { if (sending_member == members.end()) { return false; } - if (room_information.enable_citra_mods && - sending_member->user_data.moderator) { // Community moderator + if (sending_member->user_data.moderator) { // Community moderator return true; } @@ -1020,7 +1017,7 @@ bool Room::Create(const std::string& name, const std::string& description, const u32 max_connections, const std::string& host_username, const std::string& preferred_game, u64 preferred_game_id, std::unique_ptr verify_backend, - const Room::BanList& ban_list, bool enable_citra_mods) { + const Room::BanList& ban_list) { ENetAddress address; address.host = ENET_HOST_ANY; if (!server_address.empty()) { @@ -1043,7 +1040,6 @@ bool Room::Create(const std::string& name, const std::string& description, room_impl->room_information.preferred_game = preferred_game; room_impl->room_information.preferred_game_id = preferred_game_id; room_impl->room_information.host_username = host_username; - room_impl->room_information.enable_citra_mods = enable_citra_mods; room_impl->password = password; room_impl->verify_backend = std::move(verify_backend); room_impl->username_ban_list = ban_list.first; diff --git a/src/network/room.h b/src/network/room.h index a67984837..5781631d7 100644 --- a/src/network/room.h +++ b/src/network/room.h @@ -32,7 +32,6 @@ struct RoomInformation { std::string preferred_game; ///< Game to advertise that you want to play u64 preferred_game_id; ///< Title ID for the advertised game std::string host_username; ///< Forum username of the host - bool enable_citra_mods; ///< Allow Citra Moderators to moderate on this room }; struct GameInfo { @@ -148,7 +147,7 @@ public: const std::string& host_username = "", const std::string& preferred_game = "", u64 preferred_game_id = 0, std::unique_ptr verify_backend = nullptr, - const BanList& ban_list = {}, bool enable_citra_mods = false); + const BanList& ban_list = {}); /** * Sets the verification GUID of the room.