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

Timestamp:

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

Author:

bensch

Message:

merged the proxy back

File:

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

trunk/src/lib/network/peer_info.h

@@ -22 +22 @@
 
 
-    inline bool isMasterServer() { return this->nodeType == NET_MASTER_SERVER; }
-    inline bool isProxyServer() { return this->nodeType == NET_PROXY_SERVER_ACTIVE; }
-    inline bool isProxyServerPassive() { return this->nodeType == NET_PROXY_SERVER_PASSIVE; }
-    inline bool isClient() { return this->nodeType == NET_CLIENT; }
+    inline bool isMasterServer() const { return this->nodeType == NET_MASTER_SERVER; }
+    inline bool isProxyServerActive() const { return this->nodeType == NET_PROXY_SERVER_ACTIVE; }
+    inline bool isProxyServerActivePassive() const { return this->nodeType == NET_PROXY_SERVER_PASSIVE; }
+    inline bool isClient() const { return this->nodeType == NET_CLIENT; }
 
-    std::string getNodeTypeString();
+    const std::string& getNodeTypeString() const;
+    static const std::string& nodeTypeToString(unsigned int type);
+
 
 
@@ -41 +43 @@
     int                 lastAckedState;          //!< last acked state synchronized state
     int                 lastRecvedState;         //!< last received state
+
+    static const std::string nodeNames[];
+
 };