Changeset 9445 in orxonox.OLD for branches

Timestamp:

Jul 25, 2006, 8:24:21 AM (18 years ago)

Author:

bensch

Message:

some more const's

Location:

branches/proxy/src/lib/network

Files:

• monitor/network_monitor.cc (modified) (2 diffs)
• monitor/network_monitor.h (modified) (1 diff)
• peer_info.cc (modified) (2 diffs)
• peer_info.h (modified) (1 diff)

branches/proxy/src/lib/network/monitor/network_monitor.cc

@@ -179 +179 @@
  * @returns the proxy server of the first choice
  */
-PeerInfo* NetworkMonitor::getFirstChoiceProxy()
+PeerInfo* NetworkMonitor::getFirstChoiceProxy() const
 {
   // return the fist proxy in the list
@@ -189 +189 @@
  * @returns the proxy server of second choice
  */
-PeerInfo* NetworkMonitor::getSecondChoiceProxy()
+PeerInfo* NetworkMonitor::getSecondChoiceProxy() const
 {
   // return the second server in the list

branches/proxy/src/lib/network/monitor/network_monitor.h

@@ -55 +55 @@
     inline void removeMasterServer(NetworkNode* node, PeerInfo* pInfo) { node->removeMasterServer(pInfo); }
 
-    PeerInfo* getFirstChoiceProxy();
-    PeerInfo* getSecondChoiceProxy();
+    PeerInfo* getFirstChoiceProxy() const;
+    PeerInfo* getSecondChoiceProxy() const;
     /** @returns the local node */
     inline NetworkNode* getLocalNode() const { return this->localNode; };
 
     /** @returns the active proxy server list of the localnode */
-    inline std::list<PeerInfo*> getActiveProxyServer() { return this->localNode->getActiveProxyServer(); }
+    inline std::list<PeerInfo*> getActiveProxyServer() const { return this->localNode->getActiveProxyServer(); }
 
     /* slots admin and info interface */
     /** @returns the total number of players in this game (including all proxy servers etc)*/
-    inline int getPlayerNumber() { return this->playerNumber; }
+    inline int getPlayerNumber() const { return this->playerNumber; }
 
     /** @returns true if there are still free network slots available at the local node*/
-    inline bool gotFreeSlots() { return (this->localNode->getPlayerNumber() < SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
+    inline bool gotFreeSlots() const { return (this->localNode->getPlayerNumber() < SharedNetworkData::getInstance()->getMaxPlayer()); }
     /** @param node node to be checked for slots @returns true if there are still free network slots available at this node */
-    inline bool gotFreeSlots(NetworkNode* node) { return (node->getPlayerNumber() < SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
+    inline bool gotFreeSlots(NetworkNode* node) const { return (node->getPlayerNumber() < SharedNetworkData::getInstance()->getMaxPlayer()); }
 
     /** @returns true if the next client should be reconnected to some other proxy server with more connections */
-    inline bool isReconnectNextClient() { return (this->localNode->getPlayerNumber() >= SharedNetworkData::getInstance()->getMaxPlayer())?true:false; }
+    inline bool isReconnectNextClient() const { return (this->localNode->getPlayerNumber() >= SharedNetworkData::getInstance()->getMaxPlayer()); }
 
+    inline const std::list<NetworkNode*>& getNodeList() const { return this->nodeList; };
 
     void toggleGUI();

branches/proxy/src/lib/network/peer_info.cc

@@ -54 +54 @@
 
 
-const std::string& PeerInfo::getNodeTypeString()
+const std::string& PeerInfo::getNodeTypeString() const
 {
-  return nodeNames[this->nodeType];
+  return PeerInfo::nodeTypeToString( this->nodeType );
+  // the above does the same, and is faster in it. (there is no case where node is uninit i hope!)
 /*
   switch( this->nodeType)
@@ -73 +74 @@
 }
 
+const std::string& PeerInfo::nodeTypeToString(unsigned int type)
+{
+  return PeerInfo::nodeNames[type];
+}
+
+
 const std::string PeerInfo::nodeNames[] =
 {

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

@@ -27 +27 @@
     inline bool isClient() const { return this->nodeType == NET_CLIENT; }
 
-    const std::string& getNodeTypeString();
+    const std::string& getNodeTypeString() const;
+    static const std::string& nodeTypeToString(unsigned int type);