[Orxonox-commit 1274] r5992 - in code/branches/console/src: libraries/core libraries/core/input libraries/network/packet libraries/tools orxonox/overlays
rgrieder at orxonox.net
rgrieder at orxonox.net
Mon Oct 26 22:55:44 CET 2009
Author: rgrieder
Date: 2009-10-26 22:55:43 +0100 (Mon, 26 Oct 2009)
New Revision: 5992
Modified:
code/branches/console/src/libraries/core/Core.cc
code/branches/console/src/libraries/core/Core.h
code/branches/console/src/libraries/core/CorePrereqs.h
code/branches/console/src/libraries/core/GUIManager.cc
code/branches/console/src/libraries/core/GraphicsManager.h
code/branches/console/src/libraries/core/OrxonoxClass.cc
code/branches/console/src/libraries/core/input/InputBuffer.cc
code/branches/console/src/libraries/core/input/InputHandler.h
code/branches/console/src/libraries/network/packet/Packet.cc
code/branches/console/src/libraries/tools/ResourceCollection.h
code/branches/console/src/orxonox/overlays/InGameConsole.cc
Log:
Small stuff, mostly spelling mistakes.
Modified: code/branches/console/src/libraries/core/Core.cc
===================================================================
--- code/branches/console/src/libraries/core/Core.cc 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/core/Core.cc 2009-10-26 21:55:43 UTC (rev 5992)
@@ -125,7 +125,7 @@
.callback(this, &CoreConfiguration::debugLevelChanged);
SetConfigValue(language_, Language::getInstance().defaultLanguage_)
- .description("The language of the ingame text")
+ .description("The language of the in game text")
.callback(this, &CoreConfiguration::languageChanged);
SetConfigValue(bInitializeRandomNumberGenerator_, true)
.description("If true, all random actions are different each time you start the game")
@@ -221,12 +221,12 @@
// Set configurable paths like log, config and media
this->pathConfig_->setConfigurablePaths();
- // create a signal handler (only active for linux)
+ // create a signal handler (only active for Linux)
// This call is placed as soon as possible, but after the directories are set
this->signalHandler_.reset(new SignalHandler());
this->signalHandler_->doCatch(PathConfig::getExecutablePathString(), PathConfig::getLogPathString() + "orxonox_crash.log");
- // Set the correct log path. Before this call, /tmp (Unix) or %TEMP% was used
+ // Set the correct log path. Before this call, /tmp (Unix) or %TEMP% (Windows) was used
OutputHandler::getOutStream().setLogPath(PathConfig::getLogPathString());
// Parse additional options file now that we know its path
Modified: code/branches/console/src/libraries/core/Core.h
===================================================================
--- code/branches/console/src/libraries/core/Core.h 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/core/Core.h 2009-10-26 21:55:43 UTC (rev 5992)
@@ -42,7 +42,6 @@
namespace orxonox
{
class CoreConfiguration;
- class IOConsole;
/**
@brief
Modified: code/branches/console/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/console/src/libraries/core/CorePrereqs.h 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/core/CorePrereqs.h 2009-10-26 21:55:43 UTC (rev 5992)
@@ -147,6 +147,7 @@
class GraphicsManager;
class GUIManager;
class Identifier;
+ class IOConsole;
class IRC;
template <class T>
class Iterator;
Modified: code/branches/console/src/libraries/core/GUIManager.cc
===================================================================
--- code/branches/console/src/libraries/core/GUIManager.cc 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/core/GUIManager.cc 2009-10-26 21:55:43 UTC (rev 5992)
@@ -126,14 +126,14 @@
// create the CEGUI system singleton
guiSystem_.reset(new System(guiRenderer_.get(), resourceProvider_, 0, scriptModule_.get()));
- // Initialise the basic lua code
+ // Initialise the basic Lua code
rootFileInfo_ = Resource::getInfo("InitialiseGUI.lua", "GUI");
this->luaState_->doFile("InitialiseGUI.lua", "GUI", false);
// Align CEGUI mouse with OIS mouse
guiSystem_->injectMousePosition(mousePosition.first, mousePosition.second);
- // Hide the mouse cursor unless playing in fullscreen mode
+ // Hide the mouse cursor unless playing in full screen mode
if (!bFullScreen)
CEGUI::MouseCursor::getSingleton().hide();
}
@@ -279,7 +279,7 @@
@return
code of the mouse button as it is used by CEGUI
- Simple convertion from mouse event code in Orxonox to the one used in CEGUI.
+ Simple conversion from mouse event code in Orxonox to the one used in CEGUI.
*/
static inline CEGUI::MouseButton convertButton(MouseButtonCode::ByEnum button)
{
Modified: code/branches/console/src/libraries/core/GraphicsManager.h
===================================================================
--- code/branches/console/src/libraries/core/GraphicsManager.h 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/core/GraphicsManager.h 2009-10-26 21:55:43 UTC (rev 5992)
@@ -105,13 +105,13 @@
shared_ptr<XMLFile> debugOverlay_; //!< XML with various debug overlays
// config values
- std::string ogreConfigFile_; //!< ogre config file name
+ std::string ogreConfigFile_; //!< ogre config filename
std::string ogrePluginsDirectory_; //!< Directory where the Ogre plugins are located
std::string ogrePlugins_; //!< Comma separated list of all plugins to load
- std::string ogreLogFile_; //!< log file name for Ogre log messages
- int ogreLogLevelTrivial_; //!< Corresponding Orxonx debug level for LL_TRIVIAL
- int ogreLogLevelNormal_; //!< Corresponding Orxonx debug level for LL_NORMAL
- int ogreLogLevelCritical_; //!< Corresponding Orxonx debug level for LL_CRITICAL
+ std::string ogreLogFile_; //!< log filename for Ogre log messages
+ int ogreLogLevelTrivial_; //!< Corresponding Orxonox debug level for LL_TRIVIAL
+ int ogreLogLevelNormal_; //!< Corresponding Orxonox debug level for LL_NORMAL
+ int ogreLogLevelCritical_; //!< Corresponding Orxonox debug level for LL_CRITICAL
// console commands
ConsoleCommand* ccPrintScreen_;
Modified: code/branches/console/src/libraries/core/OrxonoxClass.cc
===================================================================
--- code/branches/console/src/libraries/core/OrxonoxClass.cc 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/core/OrxonoxClass.cc 2009-10-26 21:55:43 UTC (rev 5992)
@@ -33,6 +33,7 @@
#include "OrxonoxClass.h"
+#include <cassert>
#include "MetaObjectList.h"
#include "Identifier.h"
#include "WeakPtr.h"
@@ -71,6 +72,7 @@
/** @brief Deletes the object if no smart pointers point to this object. Otherwise schedules the object to be deleted as soon as possible. */
void OrxonoxClass::destroy()
{
+ assert(this); // Just in case someone tries to delete a NULL pointer
this->requestedDestruction_ = true;
if (this->referenceCount_ == 0)
delete this;
Modified: code/branches/console/src/libraries/core/input/InputBuffer.cc
===================================================================
--- code/branches/console/src/libraries/core/input/InputBuffer.cc 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/core/input/InputBuffer.cc 2009-10-26 21:55:43 UTC (rev 5992)
@@ -79,7 +79,7 @@
void InputBuffer::setConfigValues()
{
- SetConfigValue(keyRepeatDeleay_, 0.4).description("Key repeat deleay of the input buffer");
+ SetConfigValue(keyRepeatDeleay_, 0.4).description("Key repeat delay of the input buffer");
SetConfigValue(keyRepeatTime_, 0.022).description("Key repeat time of the input buffer");
if (keyRepeatDeleay_ < 0.0)
Modified: code/branches/console/src/libraries/core/input/InputHandler.h
===================================================================
--- code/branches/console/src/libraries/core/input/InputHandler.h 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/core/input/InputHandler.h 2009-10-26 21:55:43 UTC (rev 5992)
@@ -101,10 +101,10 @@
Base class for all input handlers like KeyBinder, InputBuffer, etc.
Derive from this class if you wish to receive input events.
- But keep in mind that this is pointless wihtout first having an InputState.
+ But keep in mind that this is pointless without first having an InputState.
@note
The definitions for the button events with the weird arguments are simply
- to avoid redunant code in the input devices.
+ to avoid redundant code in the input devices.
*/
class _CoreExport InputHandler
{
Modified: code/branches/console/src/libraries/network/packet/Packet.cc
===================================================================
--- code/branches/console/src/libraries/network/packet/Packet.cc 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/network/packet/Packet.cc 2009-10-26 21:55:43 UTC (rev 5992)
@@ -229,7 +229,7 @@
data we allocated ourselves.
*/
void Packet::deletePacket(ENetPacket *enetPacket){
- // Get our Packet from a gloabal map with all Packets created in the send() method of Packet.
+ // Get our Packet from a global map with all Packets created in the send() method of Packet.
std::map<size_t, Packet*>::iterator it = packetMap_.find(reinterpret_cast<size_t>(enetPacket));
assert(it != packetMap_.end());
// Make sure we don't delete it again in the destructor
Modified: code/branches/console/src/libraries/tools/ResourceCollection.h
===================================================================
--- code/branches/console/src/libraries/tools/ResourceCollection.h 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/libraries/tools/ResourceCollection.h 2009-10-26 21:55:43 UTC (rev 5992)
@@ -37,8 +37,6 @@
namespace orxonox
{
- class ResourceLocation;
-
class _ToolsExport ResourceCollection : public BaseObject
{
public:
Modified: code/branches/console/src/orxonox/overlays/InGameConsole.cc
===================================================================
--- code/branches/console/src/orxonox/overlays/InGameConsole.cc 2009-10-24 21:35:31 UTC (rev 5991)
+++ code/branches/console/src/orxonox/overlays/InGameConsole.cc 2009-10-26 21:55:43 UTC (rev 5992)
@@ -588,9 +588,9 @@
}
}
- // ###############################
- // ### satic methods ###
- // ###############################
+ // ################################
+ // ### static methods ###
+ // ################################
/**
@brief Activates the console.
More information about the Orxonox-commit
mailing list