Changeset 7190 for code

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

Files:

• core/ConfigFileManager.cc (modified) (1 diff)
• core/ConfigFileManager.h (modified) (1 diff)
• network/ClientConnection.cc (modified) (1 diff)
• network/Host.cc (modified) (4 diffs)
• network/Host.h (modified) (1 diff)
• util/OutputHandler.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc

@@ -543 +543 @@
     }
 
-    bool SettingsConfigFile::config(const std::string& section, const std::string& entry, const std::string& value)
-    {
-        return this->configImpl(section, entry, value, &ConfigValueContainer::set);
-    }
-
-    bool SettingsConfigFile::tconfig(const std::string& section, const std::string& entry, const std::string& value)
-    {
-        return this->configImpl(section, entry, value, &ConfigValueContainer::tset);
+    void SettingsConfigFile::config(const std::string& section, const std::string& entry, const std::string& value)
+    {
+        if (!this->configImpl(section, entry, value, &ConfigValueContainer::set))
+            COUT(1) << "Error: Config value \"" << entry << "\" in section \"" << section << "\" doesn't exist." << std::endl;
+    }
+
+    void SettingsConfigFile::tconfig(const std::string& section, const std::string& entry, const std::string& value)
+    {
+        if (!this->configImpl(section, entry, value, &ConfigValueContainer::tset))
+            COUT(1) << "Error: Config value \"" << entry << "\" in section \"" << section << "\" doesn't exist." << std::endl;
     }
 

code/branches/consolecommands3/src/libraries/core/ConfigFileManager.h

@@ -331 +331 @@
             void clean(bool bCleanComments = false); // tolua_export
 
-            bool config(const std::string& section, const std::string& entry, const std::string& value); // tolua_export
-            bool tconfig(const std::string& section, const std::string& entry, const std::string& value); // tolua_export
+            void config(const std::string& section, const std::string& entry, const std::string& value); // tolua_export
+            void tconfig(const std::string& section, const std::string& entry, const std::string& value); // tolua_export
             std::string getConfig(const std::string& section, const std::string& entry); // tolua_export
 

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);

code/branches/consolecommands3/src/libraries/util/OutputHandler.h

@@ -104 +104 @@
 
             //! Writes to all output devices
-            static inline const std::string& log(const std::string& text)
-                { OutputHandler::getOutStream(0).output(text) << std::endl; return text; }
+            static inline void log(const std::string& text)
+                { OutputHandler::getOutStream(0).output(text) << std::endl; }
 
             //! Writes an error message to the output
-            static inline const std::string& error(const std::string& text)
-                { OutputHandler::getOutStream(1).output(text) << std::endl; return text; }
+            static inline void error(const std::string& text)
+                { OutputHandler::getOutStream(1).output(text) << std::endl; }
 
             //! Writes a warning message to the output
-            static inline const std::string& warning(const std::string& text)
-                { OutputHandler::getOutStream(2).output(text) << std::endl; return text; }
+            static inline void warning(const std::string& text)
+                { OutputHandler::getOutStream(2).output(text) << std::endl; }
 
             //! Writes an informational message to the output
-            static inline const std::string& info(const std::string& text)
-                { OutputHandler::getOutStream(3).output(text) << std::endl; return text; }
+            static inline void info(const std::string& text)
+                { OutputHandler::getOutStream(3).output(text) << std::endl; }
 
             //! Writes a debug message to the output
-            static inline const std::string& debug(const std::string& text)
-                { OutputHandler::getOutStream(4).output(text) << std::endl; return text; }
+            static inline void debug(const std::string& text)
+                { OutputHandler::getOutStream(4).output(text) << std::endl; }
 
             //! Registers an object that receives output via a provided std::ostream