summaryrefslogtreecommitdiff
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to 'src/network')
-rw-r--r--src/network/packet.h2
-rw-r--r--src/network/room.cpp2
-rw-r--r--src/network/room_member.h16
3 files changed, 10 insertions, 10 deletions
diff --git a/src/network/packet.h b/src/network/packet.h
index e69217488..9aa2a2c9c 100644
--- a/src/network/packet.h
+++ b/src/network/packet.h
@@ -9,7 +9,7 @@
9 9
10namespace Network { 10namespace Network {
11 11
12/// A class that serializes data for network transfer. It also handles endianess 12/// A class that serializes data for network transfer. It also handles endianness
13class Packet { 13class Packet {
14public: 14public:
15 Packet() = default; 15 Packet() = default;
diff --git a/src/network/room.cpp b/src/network/room.cpp
index dc5dbce7f..e456ea09c 100644
--- a/src/network/room.cpp
+++ b/src/network/room.cpp
@@ -27,7 +27,7 @@ public:
27 std::atomic<State> state{State::Closed}; ///< Current state of the room. 27 std::atomic<State> state{State::Closed}; ///< Current state of the room.
28 RoomInformation room_information; ///< Information about this room. 28 RoomInformation room_information; ///< Information about this room.
29 29
30 std::string verify_uid; ///< A GUID which may be used for verfication. 30 std::string verify_uid; ///< A GUID which may be used for verification.
31 mutable std::mutex verify_uid_mutex; ///< Mutex for verify_uid 31 mutable std::mutex verify_uid_mutex; ///< Mutex for verify_uid
32 32
33 std::string password; ///< The password required to connect to this room. 33 std::string password; ///< The password required to connect to this room.
diff --git a/src/network/room_member.h b/src/network/room_member.h
index 0d6417294..33ac18e72 100644
--- a/src/network/room_member.h
+++ b/src/network/room_member.h
@@ -71,7 +71,7 @@ public:
71 Idle, ///< Default state (i.e. not connected) 71 Idle, ///< Default state (i.e. not connected)
72 Joining, ///< The client is attempting to join a room. 72 Joining, ///< The client is attempting to join a room.
73 Joined, ///< The client is connected to the room and is ready to send/receive packets. 73 Joined, ///< The client is connected to the room and is ready to send/receive packets.
74 Moderator, ///< The client is connnected to the room and is granted mod permissions. 74 Moderator, ///< The client is connected to the room and is granted mod permissions.
75 }; 75 };
76 76
77 enum class Error : u8 { 77 enum class Error : u8 {
@@ -201,7 +201,7 @@ public:
201 201
202 /** 202 /**
203 * Binds a function to an event that will be triggered every time the State of the member 203 * Binds a function to an event that will be triggered every time the State of the member
204 * changed. The function wil be called every time the event is triggered. The callback function 204 * changed. The function will be called every time the event is triggered. The callback function
205 * must not bind or unbind a function. Doing so will cause a deadlock 205 * must not bind or unbind a function. Doing so will cause a deadlock
206 * @param callback The function to call 206 * @param callback The function to call
207 * @return A handle used for removing the function from the registered list 207 * @return A handle used for removing the function from the registered list
@@ -210,8 +210,8 @@ public:
210 210
211 /** 211 /**
212 * Binds a function to an event that will be triggered every time an error happened. The 212 * Binds a function to an event that will be triggered every time an error happened. The
213 * function wil be called every time the event is triggered. The callback function must not bind 213 * function will be called every time the event is triggered. The callback function must not
214 * or unbind a function. Doing so will cause a deadlock 214 * bind or unbind a function. Doing so will cause a deadlock
215 * @param callback The function to call 215 * @param callback The function to call
216 * @return A handle used for removing the function from the registered list 216 * @return A handle used for removing the function from the registered list
217 */ 217 */
@@ -219,7 +219,7 @@ public:
219 219
220 /** 220 /**
221 * Binds a function to an event that will be triggered every time a ProxyPacket is received. 221 * Binds a function to an event that will be triggered every time a ProxyPacket is received.
222 * The function wil be called everytime the event is triggered. 222 * The function will be called every time the event is triggered.
223 * The callback function must not bind or unbind a function. Doing so will cause a deadlock 223 * The callback function must not bind or unbind a function. Doing so will cause a deadlock
224 * @param callback The function to call 224 * @param callback The function to call
225 * @return A handle used for removing the function from the registered list 225 * @return A handle used for removing the function from the registered list
@@ -229,7 +229,7 @@ public:
229 229
230 /** 230 /**
231 * Binds a function to an event that will be triggered every time an LDNPacket is received. 231 * Binds a function to an event that will be triggered every time an LDNPacket is received.
232 * The function wil be called everytime the event is triggered. 232 * The function will be called every time the event is triggered.
233 * The callback function must not bind or unbind a function. Doing so will cause a deadlock 233 * The callback function must not bind or unbind a function. Doing so will cause a deadlock
234 * @param callback The function to call 234 * @param callback The function to call
235 * @return A handle used for removing the function from the registered list 235 * @return A handle used for removing the function from the registered list
@@ -239,7 +239,7 @@ public:
239 239
240 /** 240 /**
241 * Binds a function to an event that will be triggered every time the RoomInformation changes. 241 * Binds a function to an event that will be triggered every time the RoomInformation changes.
242 * The function wil be called every time the event is triggered. 242 * The function will be called every time the event is triggered.
243 * The callback function must not bind or unbind a function. Doing so will cause a deadlock 243 * The callback function must not bind or unbind a function. Doing so will cause a deadlock
244 * @param callback The function to call 244 * @param callback The function to call
245 * @return A handle used for removing the function from the registered list 245 * @return A handle used for removing the function from the registered list
@@ -249,7 +249,7 @@ public:
249 249
250 /** 250 /**
251 * Binds a function to an event that will be triggered every time a ChatMessage is received. 251 * Binds a function to an event that will be triggered every time a ChatMessage is received.
252 * The function wil be called every time the event is triggered. 252 * The function will be called every time the event is triggered.
253 * The callback function must not bind or unbind a function. Doing so will cause a deadlock 253 * The callback function must not bind or unbind a function. Doing so will cause a deadlock
254 * @param callback The function to call 254 * @param callback The function to call
255 * @return A handle used for removing the function from the registered list 255 * @return A handle used for removing the function from the registered list