Changeset 8832 for code/branches/output/src/libraries/network/NetworkPrereqs.h

Timestamp:

Aug 9, 2011, 12:37:21 AM (13 years ago)

Author:

landauf

Message:

Quick and dirty fix to un-singletonize WANDiscovery. It is now created on demand by the multiplayer menu. This delays the master server connection until we really need it (and avoids the annoying connection-failed error/warning during startup if the master server can't be reached).
Also removed some unneeded/commented functions related to WANDiscovery from Server.
Presumably won't collide with the changes in the masterserver2 branch, but needs some review.

File:

• code/branches/output/src/libraries/network/NetworkPrereqs.h (modified) (2 diffs)

code/branches/output/src/libraries/network/NetworkPrereqs.h

@@ -129 +129 @@
   class GamestateManager;
   class Host;
+  class MasterServer;
+  class MasterServerComm;
   class NetworkChatListener;
   class NetworkFunctionBase;
@@ -136 +138 @@
   class NetworkMemberFunction;
   class NetworkMemberFunctionBase;
+  class PeerList;
   class Server;
   class ServerConnection;
   class TrafficControl;
+  class WANDiscoverable;
+  class WANDiscovery;
 
   // packet