[Orxonox-commit 2483] r7190 - in code/branches/consolecommands3/src/libraries: core network util
landauf at orxonox.net
landauf at orxonox.net
Thu Aug 19 17:48:01 CEST 2010
Author: landauf
Date: 2010-08-19 17:48:01 +0200 (Thu, 19 Aug 2010)
New Revision: 7190
Modified:
code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc
code/branches/consolecommands3/src/libraries/core/ConfigFileManager.h
code/branches/consolecommands3/src/libraries/network/ClientConnection.cc
code/branches/consolecommands3/src/libraries/network/Host.cc
code/branches/consolecommands3/src/libraries/network/Host.h
code/branches/consolecommands3/src/libraries/util/OutputHandler.h
Log:
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.
Modified: code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc 2010-08-19 14:57:06 UTC (rev 7189)
+++ code/branches/consolecommands3/src/libraries/core/ConfigFileManager.cc 2010-08-19 15:48:01 UTC (rev 7190)
@@ -542,14 +542,16 @@
this->save();
}
- bool SettingsConfigFile::config(const std::string& section, const std::string& entry, const std::string& value)
+ void SettingsConfigFile::config(const std::string& section, const std::string& entry, const std::string& value)
{
- return this->configImpl(section, entry, value, &ConfigValueContainer::set);
+ if (!this->configImpl(section, entry, value, &ConfigValueContainer::set))
+ COUT(1) << "Error: Config value \"" << entry << "\" in section \"" << section << "\" doesn't exist." << std::endl;
}
- bool SettingsConfigFile::tconfig(const std::string& section, const std::string& entry, const std::string& value)
+ void SettingsConfigFile::tconfig(const std::string& section, const std::string& entry, const std::string& value)
{
- return this->configImpl(section, entry, value, &ConfigValueContainer::tset);
+ if (!this->configImpl(section, entry, value, &ConfigValueContainer::tset))
+ COUT(1) << "Error: Config value \"" << entry << "\" in section \"" << section << "\" doesn't exist." << std::endl;
}
bool SettingsConfigFile::configImpl(const std::string& section, const std::string& entry, const std::string& value, bool (ConfigValueContainer::*function)(const MultiType&))
Modified: code/branches/consolecommands3/src/libraries/core/ConfigFileManager.h
===================================================================
--- code/branches/consolecommands3/src/libraries/core/ConfigFileManager.h 2010-08-19 14:57:06 UTC (rev 7189)
+++ code/branches/consolecommands3/src/libraries/core/ConfigFileManager.h 2010-08-19 15:48:01 UTC (rev 7190)
@@ -330,8 +330,8 @@
void setFilename(const std::string& filename); // tolua_export
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
void addConfigValueContainer(ConfigValueContainer* container);
Modified: code/branches/consolecommands3/src/libraries/network/ClientConnection.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/network/ClientConnection.cc 2010-08-19 14:57:06 UTC (rev 7189)
+++ code/branches/consolecommands3/src/libraries/network/ClientConnection.cc 2010-08-19 15:48:01 UTC (rev 7190)
@@ -148,8 +148,10 @@
uint32_t ClientConnection::getRTT()
{
- assert(server_);
- return server_->roundTripTime;
+ if (server_)
+ return server_->roundTripTime;
+ else
+ return 0;
}
}
Modified: code/branches/consolecommands3/src/libraries/network/Host.cc
===================================================================
--- code/branches/consolecommands3/src/libraries/network/Host.cc 2010-08-19 14:57:06 UTC (rev 7189)
+++ code/branches/consolecommands3/src/libraries/network/Host.cc 2010-08-19 15:48:01 UTC (rev 7190)
@@ -88,13 +88,13 @@
return result;
}
- bool Host::Chat(const std::string& message)
+ void Host::Chat(const std::string& message)
{
if(instances_s.size()==0)
{
for (ObjectList<ChatListener>::iterator it = ObjectList<ChatListener>::begin(); it != ObjectList<ChatListener>::end(); ++it)
it->incomingChat(message, 0);
- return true;
+// return true;
}
else
{
@@ -107,7 +107,7 @@
result = false;
}
}
- return result;
+// return result;
}
}
@@ -138,7 +138,7 @@
{
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 )
{
Modified: code/branches/consolecommands3/src/libraries/network/Host.h
===================================================================
--- code/branches/consolecommands3/src/libraries/network/Host.h 2010-08-19 14:57:06 UTC (rev 7189)
+++ code/branches/consolecommands3/src/libraries/network/Host.h 2010-08-19 15:48:01 UTC (rev 7190)
@@ -78,7 +78,7 @@
static void setClientID(unsigned int id){ clientID_s = id; }
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);
virtual void printRTT()=0;
Modified: code/branches/consolecommands3/src/libraries/util/OutputHandler.h
===================================================================
--- code/branches/consolecommands3/src/libraries/util/OutputHandler.h 2010-08-19 14:57:06 UTC (rev 7189)
+++ code/branches/consolecommands3/src/libraries/util/OutputHandler.h 2010-08-19 15:48:01 UTC (rev 7190)
@@ -103,24 +103,24 @@
OutputVectorIterator getOutputVectorEnd() const;
//! 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
void registerOutputListener(OutputListener* listener);
More information about the Orxonox-commit
mailing list