diff options
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/network/announce_multiplayer_session.cpp | 8 | ||||
| -rw-r--r-- | src/network/precompiled_headers.h | 2 | ||||
| -rw-r--r-- | src/network/room.cpp | 6 | ||||
| -rw-r--r-- | src/network/room.h | 2 | ||||
| -rw-r--r-- | src/network/verify_user.h | 2 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 8e306219f..76719c2cf 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022 yuzu Emulator Project +# SPDX-FileCopyrightText: 2022 yuzu Emulator Project & 2025 citron Homebrew Project # SPDX-License-Identifier: GPL-3.0-or-later add_library(network STATIC @@ -25,6 +25,6 @@ if (ENABLE_WEB_SERVICE) target_link_libraries(network PRIVATE web_service) endif() -if (YUZU_USE_PRECOMPILED_HEADERS) +if (CITRON_USE_PRECOMPILED_HEADERS) target_precompile_headers(network PRIVATE precompiled_headers.h) endif() diff --git a/src/network/announce_multiplayer_session.cpp b/src/network/announce_multiplayer_session.cpp index 6737ce85a..c692be9a5 100644 --- a/src/network/announce_multiplayer_session.cpp +++ b/src/network/announce_multiplayer_session.cpp @@ -23,8 +23,8 @@ AnnounceMultiplayerSession::AnnounceMultiplayerSession(Network::RoomNetwork& roo : room_network{room_network_} { #ifdef ENABLE_WEB_SERVICE backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url.GetValue(), - Settings::values.yuzu_username.GetValue(), - Settings::values.yuzu_token.GetValue()); + Settings::values.citron_username.GetValue(), + Settings::values.citron_token.GetValue()); #else backend = std::make_unique<AnnounceMultiplayerRoom::NullBackend>(); #endif @@ -156,8 +156,8 @@ void AnnounceMultiplayerSession::UpdateCredentials() { #ifdef ENABLE_WEB_SERVICE backend = std::make_unique<WebService::RoomJson>(Settings::values.web_api_url.GetValue(), - Settings::values.yuzu_username.GetValue(), - Settings::values.yuzu_token.GetValue()); + Settings::values.citron_username.GetValue(), + Settings::values.citron_token.GetValue()); #endif } diff --git a/src/network/precompiled_headers.h b/src/network/precompiled_headers.h index aabae730b..87b2e790e 100644 --- a/src/network/precompiled_headers.h +++ b/src/network/precompiled_headers.h @@ -1,4 +1,4 @@ -// SPDX-FileCopyrightText: 2022 yuzu Emulator Project +// SPDX-FileCopyrightText: 2022 yuzu Emulator Project & 2025 citron Homebrew Project // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/src/network/room.cpp b/src/network/room.cpp index d87db37de..06d1c9509 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -574,7 +574,7 @@ bool Room::RoomImpl::HasModPermission(const ENetPeer* client) const { if (sending_member == members.end()) { return false; } - if (room_information.enable_yuzu_mods && + if (room_information.enable_citron_mods && sending_member->user_data.moderator) { // Community moderator return true; @@ -1047,7 +1047,7 @@ bool Room::Create(const std::string& name, const std::string& description, const u32 max_connections, const std::string& host_username, const GameInfo preferred_game, std::unique_ptr<VerifyUser::Backend> verify_backend, - const Room::BanList& ban_list, bool enable_yuzu_mods) { + const Room::BanList& ban_list, bool enable_citron_mods) { ENetAddress address; address.host = ENET_HOST_ANY; if (!server_address.empty()) { @@ -1069,7 +1069,7 @@ bool Room::Create(const std::string& name, const std::string& description, room_impl->room_information.port = server_port; room_impl->room_information.preferred_game = preferred_game; room_impl->room_information.host_username = host_username; - room_impl->room_information.enable_yuzu_mods = enable_yuzu_mods; + room_impl->room_information.enable_citron_mods = enable_citron_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 edbd3ecfb..9226ce874 100644 --- a/src/network/room.h +++ b/src/network/room.h @@ -123,7 +123,7 @@ public: const u32 max_connections = MaxConcurrentConnections, const std::string& host_username = "", const GameInfo = {}, std::unique_ptr<VerifyUser::Backend> verify_backend = nullptr, - const BanList& ban_list = {}, bool enable_yuzu_mods = false); + const BanList& ban_list = {}, bool enable_citron_mods = false); /** * Sets the verification GUID of the room. diff --git a/src/network/verify_user.h b/src/network/verify_user.h index 6fc64d8a3..df0e9160d 100644 --- a/src/network/verify_user.h +++ b/src/network/verify_user.h @@ -12,7 +12,7 @@ struct UserData { std::string username; std::string display_name; std::string avatar_url; - bool moderator = false; ///< Whether the user is a yuzu Moderator. + bool moderator = false; ///< Whether the user is a citron Moderator. }; /** |