Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5992 for code/branches


Ignore:
Timestamp:
Oct 26, 2009, 10:55:43 PM (15 years ago)
Author:
rgrieder
Message:

Small stuff, mostly spelling mistakes.

Location:
code/branches/console/src
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • code/branches/console/src/libraries/core/Core.cc

    r5973 r5992  
    126126
    127127            SetConfigValue(language_, Language::getInstance().defaultLanguage_)
    128                 .description("The language of the ingame text")
     128                .description("The language of the in game text")
    129129                .callback(this, &CoreConfiguration::languageChanged);
    130130            SetConfigValue(bInitializeRandomNumberGenerator_, true)
     
    222222        this->pathConfig_->setConfigurablePaths();
    223223
    224         // create a signal handler (only active for linux)
     224        // create a signal handler (only active for Linux)
    225225        // This call is placed as soon as possible, but after the directories are set
    226226        this->signalHandler_.reset(new SignalHandler());
    227227        this->signalHandler_->doCatch(PathConfig::getExecutablePathString(), PathConfig::getLogPathString() + "orxonox_crash.log");
    228228
    229         // Set the correct log path. Before this call, /tmp (Unix) or %TEMP% was used
     229        // Set the correct log path. Before this call, /tmp (Unix) or %TEMP% (Windows) was used
    230230        OutputHandler::getOutStream().setLogPath(PathConfig::getLogPathString());
    231231
  • code/branches/console/src/libraries/core/Core.h

    r5973 r5992  
    4343{
    4444    class CoreConfiguration;
    45         class IOConsole;
    4645
    4746    /**
  • code/branches/console/src/libraries/core/CorePrereqs.h

    r5929 r5992  
    148148    class GUIManager;
    149149    class Identifier;
     150    class IOConsole;
    150151    class IRC;
    151152    template <class T>
  • code/branches/console/src/libraries/core/GUIManager.cc

    r5929 r5992  
    127127        guiSystem_.reset(new System(guiRenderer_.get(), resourceProvider_, 0, scriptModule_.get()));
    128128
    129         // Initialise the basic lua code
     129        // Initialise the basic Lua code
    130130        rootFileInfo_ = Resource::getInfo("InitialiseGUI.lua", "GUI");
    131131        this->luaState_->doFile("InitialiseGUI.lua", "GUI", false);
     
    134134        guiSystem_->injectMousePosition(mousePosition.first, mousePosition.second);
    135135
    136         // Hide the mouse cursor unless playing in fullscreen mode
     136        // Hide the mouse cursor unless playing in full screen mode
    137137        if (!bFullScreen)
    138138            CEGUI::MouseCursor::getSingleton().hide();
     
    280280        code of the mouse button as it is used by CEGUI
    281281
    282         Simple convertion from mouse event code in Orxonox to the one used in CEGUI.
     282        Simple conversion from mouse event code in Orxonox to the one used in CEGUI.
    283283     */
    284284    static inline CEGUI::MouseButton convertButton(MouseButtonCode::ByEnum button)
  • code/branches/console/src/libraries/core/GraphicsManager.h

    r5929 r5992  
    106106
    107107        // config values
    108         std::string         ogreConfigFile_;           //!< ogre config file name
     108        std::string         ogreConfigFile_;           //!< ogre config filename
    109109        std::string         ogrePluginsDirectory_;     //!< Directory where the Ogre plugins are located
    110110        std::string         ogrePlugins_;              //!< Comma separated list of all plugins to load
    111         std::string         ogreLogFile_;              //!< log file name for Ogre log messages
    112         int                 ogreLogLevelTrivial_;      //!< Corresponding Orxonx debug level for LL_TRIVIAL
    113         int                 ogreLogLevelNormal_;       //!< Corresponding Orxonx debug level for LL_NORMAL
    114         int                 ogreLogLevelCritical_;     //!< Corresponding Orxonx debug level for LL_CRITICAL
     111        std::string         ogreLogFile_;              //!< log filename for Ogre log messages
     112        int                 ogreLogLevelTrivial_;      //!< Corresponding Orxonox debug level for LL_TRIVIAL
     113        int                 ogreLogLevelNormal_;       //!< Corresponding Orxonox debug level for LL_NORMAL
     114        int                 ogreLogLevelCritical_;     //!< Corresponding Orxonox debug level for LL_CRITICAL
    115115
    116116        // console commands
  • code/branches/console/src/libraries/core/OrxonoxClass.cc

    r5929 r5992  
    3434#include "OrxonoxClass.h"
    3535
     36#include <cassert>
    3637#include "MetaObjectList.h"
    3738#include "Identifier.h"
     
    7273    void OrxonoxClass::destroy()
    7374    {
     75        assert(this); // Just in case someone tries to delete a NULL pointer
    7476        this->requestedDestruction_ = true;
    7577        if (this->referenceCount_ == 0)
  • code/branches/console/src/libraries/core/input/InputBuffer.cc

    r5968 r5992  
    8080    void InputBuffer::setConfigValues()
    8181    {
    82         SetConfigValue(keyRepeatDeleay_, 0.4).description("Key repeat deleay of the input buffer");
     82        SetConfigValue(keyRepeatDeleay_, 0.4).description("Key repeat delay of the input buffer");
    8383        SetConfigValue(keyRepeatTime_, 0.022).description("Key repeat time of the input buffer");
    8484
  • code/branches/console/src/libraries/core/input/InputHandler.h

    r5968 r5992  
    102102
    103103        Derive from this class if you wish to receive input events.
    104         But keep in mind that this is pointless wihtout first having an InputState.
     104        But keep in mind that this is pointless without first having an InputState.
    105105    @note
    106106        The definitions for the button events with the weird arguments are simply
    107         to avoid redunant code in the input devices.
     107        to avoid redundant code in the input devices.
    108108    */
    109109    class _CoreExport InputHandler
  • code/branches/console/src/libraries/network/packet/Packet.cc

    r5781 r5992  
    230230*/
    231231void Packet::deletePacket(ENetPacket *enetPacket){
    232   // Get our Packet from a gloabal map with all Packets created in the send() method of Packet.
     232  // Get our Packet from a global map with all Packets created in the send() method of Packet.
    233233  std::map<size_t, Packet*>::iterator it = packetMap_.find(reinterpret_cast<size_t>(enetPacket));
    234234  assert(it != packetMap_.end());
  • code/branches/console/src/libraries/tools/ResourceCollection.h

    r5781 r5992  
    3838namespace orxonox
    3939{
    40     class ResourceLocation;
    41 
    4240    class _ToolsExport ResourceCollection : public BaseObject
    4341    {
  • code/branches/console/src/orxonox/overlays/InGameConsole.cc

    r5969 r5992  
    589589    }
    590590
    591     // ###############################
    592     // ###      satic methods      ###
    593     // ###############################
     591    // ################################
     592    // ###      static methods      ###
     593    // ################################
    594594
    595595    /**
Note: See TracChangeset for help on using the changeset viewer.