summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2022-07-18 05:53:44 +0200
committerFearlessTobi <thm.frey@gmail.com>2022-07-25 21:59:31 +0200
commit899c8bb33094f43fbd8df9afb4ca84718ebac87e (patch)
tree392a54ac863f67b37bdfb006f739e8e840a9ab16 /src/network
parentAddress second part of review comments (diff)
downloadyuzu-899c8bb33094f43fbd8df9afb4ca84718ebac87e.tar
yuzu-899c8bb33094f43fbd8df9afb4ca84718ebac87e.tar.gz
yuzu-899c8bb33094f43fbd8df9afb4ca84718ebac87e.tar.bz2
yuzu-899c8bb33094f43fbd8df9afb4ca84718ebac87e.tar.lz
yuzu-899c8bb33094f43fbd8df9afb4ca84718ebac87e.tar.xz
yuzu-899c8bb33094f43fbd8df9afb4ca84718ebac87e.tar.zst
yuzu-899c8bb33094f43fbd8df9afb4ca84718ebac87e.zip
Diffstat (limited to 'src/network')
-rw-r--r--src/network/room.cpp8
-rw-r--r--src/network/room.h3
-rw-r--r--src/network/room_member.cpp2
3 files changed, 5 insertions, 8 deletions
diff --git a/src/network/room.cpp b/src/network/room.cpp
index fe55d194c..22491b299 100644
--- a/src/network/room.cpp
+++ b/src/network/room.cpp
@@ -811,7 +811,7 @@ void Room::RoomImpl::BroadcastRoomInformation() {
packet << room_information.description;
packet << room_information.member_slots;
packet << room_information.port;
- packet << room_information.preferred_game;
+ packet << room_information.preferred_game.name;
packet << room_information.host_username;
packet << static_cast<u32>(members.size());
@@ -1013,7 +1013,7 @@ Room::~Room() = default;
bool Room::Create(const std::string& name, const std::string& description,
const std::string& server_address, u16 server_port, const std::string& password,
const u32 max_connections, const std::string& host_username,
- const std::string& preferred_game, u64 preferred_game_id,
+ const GameInfo preferred_game,
std::unique_ptr<VerifyUser::Backend> verify_backend,
const Room::BanList& ban_list, bool enable_yuzu_mods) {
ENetAddress address;
@@ -1036,7 +1036,6 @@ bool Room::Create(const std::string& name, const std::string& description,
room_impl->room_information.member_slots = max_connections;
room_impl->room_information.port = server_port;
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_yuzu_mods = enable_yuzu_mods;
room_impl->password = password;
@@ -1076,8 +1075,7 @@ std::vector<Member> Room::GetRoomMemberList() const {
member.display_name = member_impl.user_data.display_name;
member.avatar_url = member_impl.user_data.avatar_url;
member.mac_address = member_impl.mac_address;
- member.game_name = member_impl.game_info.name;
- member.game_id = member_impl.game_info.id;
+ member.game = member_impl.game_info;
member_list.push_back(member);
}
return member_list;
diff --git a/src/network/room.h b/src/network/room.h
index f282a5ac3..90a82563f 100644
--- a/src/network/room.h
+++ b/src/network/room.h
@@ -125,8 +125,7 @@ public:
const std::string& server = "", u16 server_port = DefaultRoomPort,
const std::string& password = "",
const u32 max_connections = MaxConcurrentConnections,
- const std::string& host_username = "", const std::string& preferred_game = "",
- u64 preferred_game_id = 0,
+ const std::string& host_username = "", const GameInfo = {},
std::unique_ptr<VerifyUser::Backend> verify_backend = nullptr,
const BanList& ban_list = {}, bool enable_yuzu_mods = false);
diff --git a/src/network/room_member.cpp b/src/network/room_member.cpp
index d6ace9b39..11a2e276e 100644
--- a/src/network/room_member.cpp
+++ b/src/network/room_member.cpp
@@ -303,7 +303,7 @@ void RoomMember::RoomMemberImpl::HandleRoomInformationPacket(const ENetEvent* ev
packet >> info.description;
packet >> info.member_slots;
packet >> info.port;
- packet >> info.preferred_game;
+ packet >> info.preferred_game.name;
packet >> info.host_username;
room_information.name = info.name;
room_information.description = info.description;