summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/network/room_member.h12
-rw-r--r--src/yuzu_cmd/yuzu.cpp2
2 files changed, 1 insertions, 13 deletions
diff --git a/src/network/room_member.h b/src/network/room_member.h
index c835ba863..8d6254023 100644
--- a/src/network/room_member.h
+++ b/src/network/room_member.h
@@ -8,7 +8,6 @@
#include <memory>
#include <string>
#include <vector>
-#include <boost/serialization/vector.hpp>
#include "common/announce_multiplayer_room.h"
#include "common/common_types.h"
#include "network/room.h"
@@ -35,17 +34,6 @@ struct WifiPacket {
MacAddress transmitter_address; ///< Mac address of the transmitter.
MacAddress destination_address; ///< Mac address of the receiver.
u8 channel; ///< WiFi channel where this frame was transmitted.
-
-private:
- template <class Archive>
- void serialize(Archive& ar, const unsigned int) {
- ar& type;
- ar& data;
- ar& transmitter_address;
- ar& destination_address;
- ar& channel;
- }
- friend class boost::serialization::access;
};
/// Represents a chat message.
diff --git a/src/yuzu_cmd/yuzu.cpp b/src/yuzu_cmd/yuzu.cpp
index 0194940be..e10d3f5b4 100644
--- a/src/yuzu_cmd/yuzu.cpp
+++ b/src/yuzu_cmd/yuzu.cpp
@@ -359,7 +359,7 @@ int main(int argc, char** argv) {
system.TelemetrySession().AddField(Common::Telemetry::FieldType::App, "Frontend", "SDL");
if (use_multiplayer) {
- if (auto member = Network::GetRoomMember().lock()) {
+ if (auto member = system.GetRoomNetwork().GetRoomMember().lock()) {
member->BindOnChatMessageRecieved(OnMessageReceived);
member->BindOnStatusMessageReceived(OnStatusMessageReceived);
member->BindOnStateChanged(OnStateChanged);