Changeset 21841 for ps

Timestamp:

06/06/18 23:17:01 (7 years ago)

Author:

elexis

Message:

In preparation of D1513, allow the NetClientSession to find out if it's the "Local Client", refs #5163.

For good practice, mention all members in the affected member initializer list:
Add booelan m_IsLocalClient and u32 m_HostID to the member initializer list (to not have them undefined, even though they are not read from until they are set).
Add the strings m_GUID and m_UserName for completeness (even though the default constructor is already called for strings).
Use nullptr instead of NULL for pointers.

Comments By: Vladislav

Location:

ps/trunk/source/network

Files:

• NetSession.cpp (modified) (4 diffs)
• NetSession.h (modified) (2 diffs)

ps/trunk/source/network/NetSession.cpp

@@ -1 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -34 +34 @@
 
 CNetClientSession::CNetClientSession(CNetClient& client) :
-    m_Client(client), m_FileTransferer(this), m_Host(NULL), m_Server(NULL), m_Stats(NULL)
+    m_Client(client), m_FileTransferer(this), m_Host(nullptr), m_Server(nullptr), m_Stats(nullptr), m_IsLocalClient(false)
 {
 }
@@ -81 +81 @@
     m_Host = host;
     m_Server = peer;
+    m_IsLocalClient = isLocalClient;
 
     // Prevent the local client of the host from timing out too quickly.
@@ -201 +202 @@
 }
 
-
-
 CNetServerSession::CNetServerSession(CNetServerWorker& server, ENetPeer* peer) :
-    m_Server(server), m_FileTransferer(this), m_Peer(peer)
+    m_Server(server), m_FileTransferer(this), m_Peer(peer), m_IsLocalClient(false), m_HostID(0), m_GUID(), m_UserName()
 {
 }

ps/trunk/source/network/NetSession.h

@@ -1 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
@@ -116 +116 @@
     ENetPeer* m_Server;
     CNetStatsTable* m_Stats;
+
+    bool m_IsLocalClient;
 };