summaryrefslogtreecommitdiffstats
path: root/src/network/room_member.h
diff options
context:
space:
mode:
authorB3n30 <benediktthomas@gmail.com>2017-07-15 11:39:27 +0200
committerB3n30 <benediktthomas@gmail.com>2017-07-16 21:30:10 +0200
commit253d3dd3d889eb61131810b04137ee3f9445db64 (patch)
tree5ff2298ff663de6761425daa1d6943275ee914ea /src/network/room_member.h
parentNetwork: Made send async in RoomMember (diff)
downloadyuzu-253d3dd3d889eb61131810b04137ee3f9445db64.tar
yuzu-253d3dd3d889eb61131810b04137ee3f9445db64.tar.gz
yuzu-253d3dd3d889eb61131810b04137ee3f9445db64.tar.bz2
yuzu-253d3dd3d889eb61131810b04137ee3f9445db64.tar.lz
yuzu-253d3dd3d889eb61131810b04137ee3f9445db64.tar.xz
yuzu-253d3dd3d889eb61131810b04137ee3f9445db64.tar.zst
yuzu-253d3dd3d889eb61131810b04137ee3f9445db64.zip
Diffstat (limited to '')
-rw-r--r--src/network/room_member.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/room_member.h b/src/network/room_member.h
index 6522f053c..fce608c82 100644
--- a/src/network/room_member.h
+++ b/src/network/room_member.h
@@ -97,7 +97,8 @@ public:
* This may fail if the username is already taken.
*/
void Join(const std::string& nickname, const char* server_addr = "127.0.0.1",
- const u16 serverPort = DefaultRoomPort, const u16 clientPort = 0);
+ const u16 serverPort = DefaultRoomPort, const u16 clientPort = 0,
+ const MacAddress& preferred_mac = NoPreferredMac);
/**
* Sends a WiFi packet to the room.