diff options
| author | 2022-07-23 19:28:19 +0200 | |
|---|---|---|
| committer | 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.gz yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.tar.xz yuzu-6b5667dfa55c2c0c9537a2f46537158e316d0508.zip | |
yuzu_cmd: Fix compilation
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 @@ | |||
| 8 | #include <memory> | 8 | #include <memory> |
| 9 | #include <string> | 9 | #include <string> |
| 10 | #include <vector> | 10 | #include <vector> |
| 11 | #include <boost/serialization/vector.hpp> | ||
| 12 | #include "common/announce_multiplayer_room.h" | 11 | #include "common/announce_multiplayer_room.h" |
| 13 | #include "common/common_types.h" | 12 | #include "common/common_types.h" |
| 14 | #include "network/room.h" | 13 | #include "network/room.h" |
| @@ -35,17 +34,6 @@ struct WifiPacket { | |||
| 35 | MacAddress transmitter_address; ///< Mac address of the transmitter. | 34 | MacAddress transmitter_address; ///< Mac address of the transmitter. |
| 36 | MacAddress destination_address; ///< Mac address of the receiver. | 35 | MacAddress destination_address; ///< Mac address of the receiver. |
| 37 | u8 channel; ///< WiFi channel where this frame was transmitted. | 36 | u8 channel; ///< WiFi channel where this frame was transmitted. |
| 38 | |||
| 39 | private: | ||
| 40 | template <class Archive> | ||
| 41 | void serialize(Archive& ar, const unsigned int) { | ||
| 42 | ar& type; | ||
| 43 | ar& data; | ||
| 44 | ar& transmitter_address; | ||
| 45 | ar& destination_address; | ||
| 46 | ar& channel; | ||
| 47 | } | ||
| 48 | friend class boost::serialization::access; | ||
| 49 | }; | 37 | }; |
| 50 | 38 | ||
| 51 | /// Represents a chat message. | 39 | /// 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) { | |||
| 359 | system.TelemetrySession().AddField(Common::Telemetry::FieldType::App, "Frontend", "SDL"); | 359 | system.TelemetrySession().AddField(Common::Telemetry::FieldType::App, "Frontend", "SDL"); |
| 360 | 360 | ||
| 361 | if (use_multiplayer) { | 361 | if (use_multiplayer) { |
| 362 | if (auto member = Network::GetRoomMember().lock()) { | 362 | if (auto member = system.GetRoomNetwork().GetRoomMember().lock()) { |
| 363 | member->BindOnChatMessageRecieved(OnMessageReceived); | 363 | member->BindOnChatMessageRecieved(OnMessageReceived); |
| 364 | member->BindOnStatusMessageReceived(OnStatusMessageReceived); | 364 | member->BindOnStatusMessageReceived(OnStatusMessageReceived); |
| 365 | member->BindOnStateChanged(OnStateChanged); | 365 | member->BindOnStateChanged(OnStateChanged); |