Changeset 9494 in orxonox.OLD for trunk/src/lib/network/shared_network_data.h

Timestamp:

Jul 27, 2006, 10:44:28 AM (18 years ago)

Author:

bensch

Message:

merged the proxy back

File:

• trunk/src/lib/network/shared_network_data.h (modified) (2 diffs)

trunk/src/lib/network/shared_network_data.h

@@ -14 +14 @@
 #define NET_MAX_CONNECTIONS 2
 
-class NetworkStream;
+
 class Synchronizeable;
 
@@ -28 +28 @@
 
     /** @returns the next uniqueID free for an object */
-    inline int getNewUniqueID() { return ( this->nodeType != NET_CLIENT)?this->newUniqueID++:-1; }
+    inline int getNewUniqueID() { return ( isMasterServer())?this->newUniqueID++:-1; }
     /** sets the @param newUniqueID: the new offset for the next unique id */
     inline void setNewUniqueID(int newUniqueID) { this->newUniqueID = newUniqueID; }
 
+    /** sets the game server flag @param bGameServer true if it is a game server */
+    inline void setNodeType(int nodeType) { this->nodeType = nodeType; }
     /** @returns true is this node is a master server */
     inline bool isMasterServer() { return this->nodeType == NET_MASTER_SERVER; }
     /** @returns true is this node is a proxy server */
-    inline bool isProxyServer() { return this->nodeType == NET_PROXY_SERVER_ACTIVE; }
+    inline bool isProxyServerActive() { return this->nodeType == NET_PROXY_SERVER_ACTIVE; }
     /** @returns true is this node is a client*/
     inline bool isClient() { return this->nodeType == NET_CLIENT; }
-    /** sets the game server flag @param bGameServer true if it is a game server */
-    inline void setNodeType(int nodeType) { this->nodeType = nodeType; }
+
+    /** @return true if this user is connected to the local host */
+    bool isUserLocal( int userID);
+    /** @returns true if this user is a master server */
+    bool isUserMasterServer( int userID );
+    /** @returns true if this user is a proxy server */
+    bool isUserProxyServerActive( int userID );
+    /** @returns true if this user is a client */
+    bool isUserClient( int userID );
+
 
     /** @returns the maximum number of players for this server */