Changeset 7190 for code/branches/consolecommands3/src/libraries/network

Timestamp:

Aug 19, 2010, 5:48:01 PM (14 years ago)

Author:

landauf

Message:

removed unnecessary return values from console commands "log", "error", "warning", "info", and "debug"
removed return value from console command Chat (the non-static chat functions still return a bool)
config and tconfig don't return a bool anymore but instead print an error if the config value doesn't exist.

fixed console command "printRTT" - it shouldn't crash on a standalone system.

Location:

code/branches/consolecommands3/src/libraries/network

Files:

• ClientConnection.cc (modified) (1 diff)
• Host.cc (modified) (4 diffs)
• Host.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/network/ClientConnection.cc

@@ -149 +149 @@
   uint32_t ClientConnection::getRTT()
   {
-    assert(server_);
-    return server_->roundTripTime;
+    if (server_)
+        return server_->roundTripTime;
+    else
+        return 0;
   }
 

code/branches/consolecommands3/src/libraries/network/Host.cc

@@ -89 +89 @@
   }
 
-  bool Host::Chat(const std::string& message)
+  void Host::Chat(const std::string& message)
   {
     if(instances_s.size()==0)
@@ -95 +95 @@
       for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
         it->incomingChat(message, 0);
-      return true;
+//      return true;
     }
     else
@@ -108 +108 @@
         }
       }
-      return result;
+//      return result;
     }
   }
@@ -139 +139 @@
     for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
       it->incomingChat(message, playerID);
-    
+
     bool result = true;
     for( std::vector<Host*>::iterator it = instances_s.begin(); it!=instances_s.end(); ++it )

code/branches/consolecommands3/src/libraries/network/Host.h

@@ -79 +79 @@
     static void setShipID(unsigned int id){ shipID_s = id; }
     static bool isServer();
-    static bool Chat(const std::string& message);
+    static void Chat(const std::string& message);
     static bool Broadcast(const std::string& message);
     static bool incomingChat(const std::string& message, unsigned int playerID);