diff options
author | FearlessTobi <thm.frey@gmail.com> | 2022-07-23 19:28:19 +0200 |
---|---|---|
committer | FearlessTobi <thm.frey@gmail.com> | 2022-07-25 21:59:31 +0200 |
commit | 6b5667dfa55c2c0c9537a2f46537158e316d0508 (patch) | |
tree | 2e25ca036244d53d4a3ac3d6d89771d30bade076 | |
parent | network: Move global state into a seperate class (diff) | |
download | yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.tar yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.tar.gz yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.tar.bz2 yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.tar.lz yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.tar.xz yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.tar.zst yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.zip |
Diffstat (limited to '')
-rw-r--r-- | src/network/room_member.h | 12 | ||||
-rw-r--r-- | src/yuzu_cmd/yuzu.cpp | 2 |
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); |