diff options
Diffstat (limited to '')
| -rw-r--r-- | src/network/room.cpp | 8 |
1 files changed, 3 insertions, 5 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() { | |||
| 811 | packet << room_information.description; | 811 | packet << room_information.description; |
| 812 | packet << room_information.member_slots; | 812 | packet << room_information.member_slots; |
| 813 | packet << room_information.port; | 813 | packet << room_information.port; |
| 814 | packet << room_information.preferred_game; | 814 | packet << room_information.preferred_game.name; |
| 815 | packet << room_information.host_username; | 815 | packet << room_information.host_username; |
| 816 | 816 | ||
| 817 | packet << static_cast<u32>(members.size()); | 817 | packet << static_cast<u32>(members.size()); |
| @@ -1013,7 +1013,7 @@ Room::~Room() = default; | |||
| 1013 | bool Room::Create(const std::string& name, const std::string& description, | 1013 | bool Room::Create(const std::string& name, const std::string& description, |
| 1014 | const std::string& server_address, u16 server_port, const std::string& password, | 1014 | const std::string& server_address, u16 server_port, const std::string& password, |
| 1015 | const u32 max_connections, const std::string& host_username, | 1015 | const u32 max_connections, const std::string& host_username, |
| 1016 | const std::string& preferred_game, u64 preferred_game_id, | 1016 | const GameInfo preferred_game, |
| 1017 | std::unique_ptr<VerifyUser::Backend> verify_backend, | 1017 | std::unique_ptr<VerifyUser::Backend> verify_backend, |
| 1018 | const Room::BanList& ban_list, bool enable_yuzu_mods) { | 1018 | const Room::BanList& ban_list, bool enable_yuzu_mods) { |
| 1019 | ENetAddress address; | 1019 | ENetAddress address; |
| @@ -1036,7 +1036,6 @@ bool Room::Create(const std::string& name, const std::string& description, | |||
| 1036 | room_impl->room_information.member_slots = max_connections; | 1036 | room_impl->room_information.member_slots = max_connections; |
| 1037 | room_impl->room_information.port = server_port; | 1037 | room_impl->room_information.port = server_port; |
| 1038 | room_impl->room_information.preferred_game = preferred_game; | 1038 | room_impl->room_information.preferred_game = preferred_game; |
| 1039 | room_impl->room_information.preferred_game_id = preferred_game_id; | ||
| 1040 | room_impl->room_information.host_username = host_username; | 1039 | room_impl->room_information.host_username = host_username; |
| 1041 | room_impl->room_information.enable_yuzu_mods = enable_yuzu_mods; | 1040 | room_impl->room_information.enable_yuzu_mods = enable_yuzu_mods; |
| 1042 | room_impl->password = password; | 1041 | room_impl->password = password; |
| @@ -1076,8 +1075,7 @@ std::vector<Member> Room::GetRoomMemberList() const { | |||
| 1076 | member.display_name = member_impl.user_data.display_name; | 1075 | member.display_name = member_impl.user_data.display_name; |
| 1077 | member.avatar_url = member_impl.user_data.avatar_url; | 1076 | member.avatar_url = member_impl.user_data.avatar_url; |
| 1078 | member.mac_address = member_impl.mac_address; | 1077 | member.mac_address = member_impl.mac_address; |
| 1079 | member.game_name = member_impl.game_info.name; | 1078 | member.game = member_impl.game_info; |
| 1080 | member.game_id = member_impl.game_info.id; | ||
| 1081 | member_list.push_back(member); | 1079 | member_list.push_back(member); |
| 1082 | } | 1080 | } |
| 1083 | return member_list; | 1081 | return member_list; |