Changeset 7772 for code/branches/network5/src/libraries/network/NetworkPrereqs.h

Timestamp:

Dec 17, 2010, 10:41:24 AM (15 years ago)

Author:

scheusso

Message:

network is now multithreaded again
further testing needed

File:

• code/branches/network5/src/libraries/network/NetworkPrereqs.h (modified) (3 diffs)

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

@@ -64 +64 @@
 namespace orxonox
 {
-  static const unsigned int GAMESTATEID_INITIAL     = static_cast<unsigned int>(-1);
-  static const unsigned int CLIENTID_UNKNOWN        = static_cast<unsigned int>(-2);
+  static const unsigned int GAMESTATEID_INITIAL       = static_cast<unsigned int>(-1);
+  static const unsigned int CLIENTID_UNKNOWN          = static_cast<unsigned int>(-2);
   extern const char* LAN_DISCOVERY_MESSAGE;
   extern const char* LAN_DISCOVERY_ACK;
-  static const unsigned int LAN_DISCOVERY_PORT      = 55557;
-  static const unsigned int NETWORK_PEER_ID_SERVER = 0;
+  static const unsigned int LAN_DISCOVERY_PORT        = 55557;
+  static const unsigned int NETWORK_PEER_ID_SERVER    = 0;
+  static const unsigned int NETWORK_CHANNEL_DEFAULT   = 0;
+  static const unsigned int NETWORK_CHANNEL_RELIABLE  = 1;
 }
 
@@ -98 +100 @@
 // from ENet
 struct _ENetPeer;
-typedef _ENetPeer ENetPeer;
+typedef _ENetPeer     ENetPeer;
 struct _ENetPacket;
-typedef _ENetPacket ENetPacket;
+typedef _ENetPacket   ENetPacket;
 struct _ENetEvent;
-typedef _ENetEvent ENetEvent;
+typedef _ENetEvent    ENetEvent;
 struct _ENetHost;
-typedef _ENetHost ENetHost;
+typedef _ENetHost     ENetHost;
 struct _ENetAddress;
-typedef _ENetAddress ENetAddress;
+typedef _ENetAddress  ENetAddress;
+typedef uint8_t       ENetChannelID;
 
 namespace orxonox
@@ -162 +165 @@
 }
 
+namespace boost
+{
+  class mutex;
+  class thread;
+}
+
 #endif /* _NetworkPrereqs_H__ */