Changeset 9285 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.h

Timestamp:

Jul 14, 2006, 10:46:13 AM (19 years ago)

Author:

patrick

Message:

another standardisation: less different types with the same content

File:

• branches/proxy/src/lib/network/network_stream.h (modified) (2 diffs)

branches/proxy/src/lib/network/network_stream.h

@@ -48 +48 @@
 
     /* functions for the localhost settings */
-    inline bool isMasterServer() const { return (this->nodeType == NET_MASTER_SERVER)? true:false; }
-    inline bool isProxyServer() const { return (this->nodeType == NET_PROXY_SERVER)? true:false; }
-    inline bool isClient() const { return (this->nodeType == NET_CLIENT)? true:false; }
+    inline bool isMasterServer() const { return (this->pInfo->nodeType == NET_MASTER_SERVER)? true:false; }
+    inline bool isProxyServer() const { return (this->pInfo->nodeType == NET_PROXY_SERVER)? true:false; }
+    inline bool isClient() const { return (this->pInfo->nodeType == NET_CLIENT)? true:false; }
 //     inline bool isActive() const { return this->bActive; }
     inline int getMaxConnections(){ return MAX_CONNECTIONS; }
@@ -94 +94 @@
 
     PeerInfo*                  pInfo;                       //!< the info about the local peer node (not in the PeerList)
-    int                        nodeType;                    //!< the type of this host (NET_CLIENT, NET_MASTER_SERVER,...)
-    int                        myHostId;                    //!< the host id of the localhost
 
     std::list<int>             freeSocketSlots;             //!< list of free sockets (to ensure not to resycle sockets)