Changeset 2990 for code/branches/netp3/src/network/ClientConnection.h

Timestamp:

May 19, 2009, 9:35:10 PM (15 years ago)

Author:

scheusso

Message:

merged netp2 → netp3

Location:

code/branches/netp3

Files:

• . (modified) (1 prop)
• src/network/ClientConnection.h (modified) (3 diffs)

code/branches/netp3/src/network/ClientConnection.h

@@ -53 +53 @@
     const int NETWORK_PORT = 55556;
     const int NETWORK_CLIENT_MAX_CONNECTIONS = 5;
-    const int NETWORK_CLIENT_WAIT_TIME = 1;
+    const int NETWORK_CLIENT_WAIT_TIME = 10;
     const int NETWORK_CLIENT_CONNECT_TIMEOUT = 3000; // miliseconds
     const int NETWORK_CLIENT_CHANNELS = 2;
@@ -76 +76 @@
     //bool sendPackets(ENetEvent *event);
     bool waitEstablished(int milisec);
-    bool isConnected(){return established;}
+    inline bool isConnected(){return established;}
+    inline bool checkConnection(){ return !quit_ && isConnected(); }
   private:
     ClientConnection(const ClientConnection& copy); // not used
@@ -90 +91 @@
     ENetAddress *serverAddress;
     // quit-variable (communication with threads)
-    bool quit;
+    bool quit_;
     bool established;
     // clientlist