summaryrefslogtreecommitdiff
path: root/src/network/room.cpp
diff options
context:
space:
mode:
authorB3n30 <benediktthomas@gmail.com>2017-07-26 21:06:40 +0200
committerB3n30 <benediktthomas@gmail.com>2017-07-26 21:06:40 +0200
commit718423e506da5e08384770ea06634f34c9e0657f (patch)
treeca959b2c11f5732004b08afd3c6d12f20199106d /src/network/room.cpp
parentf2f39102fae93b47085d425a759b171e35546235 (diff)
Network: Moved NintendoOUI initalization to RoomMember constructor
Diffstat (limited to 'src/network/room.cpp')
-rw-r--r--src/network/room.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/network/room.cpp b/src/network/room.cpp
index 8b7915bb7..fbbaf8b93 100644
--- a/src/network/room.cpp
+++ b/src/network/room.cpp
@@ -19,7 +19,7 @@ static constexpr u32 MaxConcurrentConnections = 10;
class Room::RoomImpl {
public:
// This MAC address is used to generate a 'Nintendo' like Mac address.
- const MacAddress NintendoOUI = {0x00, 0x1F, 0x32, 0x00, 0x00, 0x00};
+ const MacAddress NintendoOUI;
std::mt19937 random_gen; ///< Random number generator. Used for GenerateMacAddress
ENetHost* server = nullptr; ///< Network interface.
@@ -36,7 +36,8 @@ public:
using MemberList = std::vector<Member>;
MemberList members; ///< Information about the members of this room.
- RoomImpl() : random_gen(std::random_device()()) {}
+ RoomImpl()
+ : random_gen(std::random_device()()), NintendoOUI{0x00, 0x1F, 0x32, 0x00, 0x00, 0x00} {}
/// Thread that receives and dispatches network packets
std::unique_ptr<std::thread> room_thread;