Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10817 for code/branches


Ignore:
Timestamp:
Nov 19, 2015, 11:40:28 AM (9 years ago)
Author:
muemart
Message:

Run clang-modernize -add-override
A few notes:

  • There are probably some overrides missing, especially in funky templatey code
  • Virtual methods with wrong signatures were not fixed, needs to be done by hand (only warnings get emitted)
Location:
code/branches/cpp11_v2/src
Files:
318 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cpp11_v2/src/libraries/core/ConfigurablePaths.cc

    r10769 r10817  
    5454#include "util/Exception.h"
    5555#include "commandline/CommandLineIncludes.h"
     56#include "core/ApplicationPaths.h"
    5657
    5758// Differentiate Boost Filesystem v2 and v3

  • code/branches/cpp11_v2/src/libraries/core/Core.h

    r10624 r10817  
    4545
    4646#include <string>
     47#include <list>
    4748#include "util/DestructionHelper.h"
    4849#include "util/Singleton.h"

  • code/branches/cpp11_v2/src/libraries/core/CoreIncludes.h

    r10765 r10817  
    221221        struct InheritsFromClass : public Identifier::InheritsFrom
    222222        {
    223             virtual Identifier* getParent() const { return Class(T); }
     223            virtual Identifier* getParent() const override { return Class(T); }
    224224        };
    225225
    … …  
    231231            ~StaticallyInitializedIdentifier() { delete identifier_; }
    232232
    233             virtual void load()
     233            virtual void load() override
    234234            {
    235235                IdentifierManager::getInstance().addIdentifier(this->identifier_);
    236236            }
    237237
    238             virtual void unload()
     238            virtual void unload() override
    239239            {
    240240                IdentifierManager::getInstance().removeIdentifier(this->identifier_);

  • code/branches/cpp11_v2/src/libraries/core/CoreStaticInitializationHandler.h

    r10624 r10817  
    4343            CoreStaticInitializationHandler() : bInitInstances_(false) {}
    4444
    45             virtual void setupHandler();
    46             virtual void shutdownHandler();
     45            virtual void setupHandler() override;
     46            virtual void shutdownHandler() override;
    4747
    48             virtual void loadModule(ModuleInstance* module);
    49             virtual void unloadModule(ModuleInstance* module);
     48            virtual void loadModule(ModuleInstance* module) override;
     49            virtual void unloadModule(ModuleInstance* module) override;
    5050
    5151            inline void setInitInstances(bool bInitInstances)

  • code/branches/cpp11_v2/src/libraries/core/GUIManager.cc

    r10775 r10817  
    124124    {
    125125    public:
    126         void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard)
     126        void logEvent(const CEGUI::String& message, CEGUI::LoggingLevel level = CEGUI::Standard) override
    127127        {
    128128            OutputLevel orxonoxLevel = level::debug_output;
    … …  
    143143
    144144        /// Carbon copy from CEGUIDefaultLogger.cpp with a bugfix for Windows
    145         void setLogFilename(const CEGUI::String& filename, bool append = false)
     145        void setLogFilename(const CEGUI::String& filename, bool append = false) override
    146146        {
    147147            // Close current log file (if any)
    … …  
    228228    public:
    229229        /// Callback from Ogre invoked before other stuff in our target queue is rendered
    230         void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue)
     230        void renderQueueStarted(Ogre::uint8 id, const Ogre::String& invocation, bool& skipThisQueue) override
    231231        {
    232232            if (id == Ogre::RENDER_QUEUE_OVERLAY && invocation.empty())

  • code/branches/cpp11_v2/src/libraries/core/GUIManager.h

    r10771 r10817  
    169169
    170170        // keyHandler functions
    171         void buttonPressed (const KeyEvent& evt);
    172         void buttonReleased(const KeyEvent& evt);
     171        void buttonPressed (const KeyEvent& evt) override;
     172        void buttonReleased(const KeyEvent& evt) override;
    173173
    174174        // mouseHandler functions
    175         void buttonPressed (MouseButtonCode::ByEnum id);
    176         void buttonReleased(MouseButtonCode::ByEnum id);
    177         void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
    178         void mouseScrolled (int abs, int rel);
     175        void buttonPressed (MouseButtonCode::ByEnum id) override;
     176        void buttonReleased(MouseButtonCode::ByEnum id) override;
     177        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
     178        void mouseScrolled (int abs, int rel) override;
    179179        void mouseLeft     ();
    180180
    181181        // window event handler
    182         virtual void windowResized(unsigned int newWidth, unsigned int newHeight);
    183         virtual void windowFocusChanged(bool bFocus);
     182        virtual void windowResized(unsigned int newWidth, unsigned int newHeight) override;
     183        virtual void windowFocusChanged(bool bFocus) override;
    184184
    185185#ifdef ORXONOX_OLD_CEGUI

  • code/branches/cpp11_v2/src/libraries/core/Game.h

    r10772 r10817  
    135135        {
    136136        public:
    137             std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info)
     137            std::shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) override
    138138                { return std::shared_ptr<GameState>(std::make_shared<T>(info)); }
    139139        };

  • code/branches/cpp11_v2/src/libraries/core/GraphicsManager.cc

    r10771 r10817  
    8282    {
    8383    public:
    84         void windowResized     (Ogre::RenderWindow* rw)
     84        void windowResized     (Ogre::RenderWindow* rw) override
    8585            { orxonox::WindowEventListener::resizeWindow(rw->getWidth(), rw->getHeight()); }
    86         void windowFocusChange (Ogre::RenderWindow* rw)
     86        void windowFocusChange (Ogre::RenderWindow* rw) override
    8787            { orxonox::WindowEventListener::changeWindowFocus(rw->isActive()); }
    88         void windowClosed      (Ogre::RenderWindow* rw)
     88        void windowClosed      (Ogre::RenderWindow* rw) override
    8989            { orxonox::Game::getInstance().stop(); }
    90         void windowMoved       (Ogre::RenderWindow* rw)
     90        void windowMoved       (Ogre::RenderWindow* rw) override
    9191            { orxonox::WindowEventListener::moveWindow(); }
    9292    };

  • code/branches/cpp11_v2/src/libraries/core/GraphicsManager.h

    r10771 r10817  
    111111        // event from Ogre::LogListener
    112112#if OGRE_VERSION >= 0x010800
    113         void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage);
     113        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName, bool& skipThisMessage) override;
    114114#else
    115115        void messageLogged(const std::string& message, Ogre::LogMessageLevel lml, bool maskDebug, const std::string& logName);

  • code/branches/cpp11_v2/src/libraries/core/LuaState.cc

    r10771 r10817  
    3333extern "C" {
    3434#include <lua.h>
    35 #include <lualib.h>
     35#include <lualib.h>     
    3636}
    3737#include <loki/ScopeGuard.h>

  • code/branches/cpp11_v2/src/libraries/core/Namespace.h

    r9667 r10817  
    5050            virtual ~Namespace();
    5151
    52             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     52            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5353
    5454            void loadObjects(BaseObject* object);

  • code/branches/cpp11_v2/src/libraries/core/Template.h

    r9667 r10817  
    5454            virtual ~Template();
    5555
    56             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    57             virtual void changedName();
     56            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     57            virtual void changedName() override;
    5858
    5959            inline void setLink(const std::string& link)

  • code/branches/cpp11_v2/src/libraries/core/XMLPort.h

    r10768 r10817  
    459459            }
    460460
    461             virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param)
     461            virtual XMLPortParamContainer& defaultValue(unsigned int index, const MultiType& param) override
    462462            {
    463463                if (!this->loadexecutor_->defaultValueSet(index))
    … …  
    465465                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    466466            }
    467             virtual XMLPortParamContainer& defaultValues(const MultiType& param1)
     467            virtual XMLPortParamContainer& defaultValues(const MultiType& param1) override
    468468            {
    469469                if (!this->loadexecutor_->defaultValueSet(0))
    … …  
    471471                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    472472            }
    473             virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2)
     473            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2) override
    474474            {
    475475                if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)))
    … …  
    477477                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    478478            }
    479             virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3)
     479            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3) override
    480480            {
    481481                if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)))
    … …  
    483483                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    484484            }
    485             virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4)
     485            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4) override
    486486            {
    487487                if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)))
    … …  
    489489                return this->portIfWaitingForDefaultValues(this->parseResult_, this->parseParams_);
    490490            }
    491             virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5)
     491            virtual XMLPortParamContainer& defaultValues(const MultiType& param1, const MultiType& param2, const MultiType& param3, const MultiType& param4, const MultiType& param5) override
    492492            {
    493493                if ((!this->loadexecutor_->defaultValueSet(0)) || (!this->loadexecutor_->defaultValueSet(1)) || (!this->loadexecutor_->defaultValueSet(2)) || (!this->loadexecutor_->defaultValueSet(3)) || (!this->loadexecutor_->defaultValueSet(4)))
    … …  
    556556            }
    557557
    558             void callLoadExecutor(BaseObject* object, BaseObject* newObject)
     558            void callLoadExecutor(BaseObject* object, BaseObject* newObject) override
    559559            {
    560560                T* castObject = orxonox_cast<T*>(object);

  • code/branches/cpp11_v2/src/libraries/core/class/Identifier.h

    r10774 r10817  
    289289            bool initializeObject(T* object);
    290290
    291             virtual void updateConfigValues(bool updateChildren = true) const;
    292 
    293             virtual const std::type_info& getTypeInfo()
     291            virtual void updateConfigValues(bool updateChildren = true) const override;
     292
     293            virtual const std::type_info& getTypeInfo() override
    294294                { return typeid(T); }
    295295
    296             virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const
     296            virtual bool canDynamicCastObjectToIdentifierClass(Identifiable* object) const override
    297297                { return dynamic_cast<T*>(object) != nullptr; }
    298298
    299             virtual void destroyObjects();
     299            virtual void destroyObjects() override;
    300300
    301301            static ClassIdentifier<T>* getIdentifier();

  • code/branches/cpp11_v2/src/libraries/core/class/Super.h

    r10768 r10817  
    584584        // Creates the super-function-callers by calling the first SuperFunctionCondition check
    585585        // This get's called within the initialization of an Identifier
    586         virtual void createSuperFunctionCaller() const
     586        virtual void createSuperFunctionCaller() const override
    587587        {
    588588            SuperFunctionCondition<0, T, 0, 0>::superCheck();

  • code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandIncludes.h

    r10765 r10817  
    316316            ~StaticallyInitializedConsoleCommand() { delete command_; }
    317317
    318             virtual void load();
    319             virtual void unload();
     318            virtual void load() override;
     319            virtual void unload() override;
    320320
    321321            inline ConsoleCommand& getCommand()

  • code/branches/cpp11_v2/src/libraries/core/command/ConsoleCommandManager.h

    r10769 r10817  
    3838
    3939#include "util/Singleton.h"
     40
     41#include <map>
    4042
    4143namespace orxonox

  • code/branches/cpp11_v2/src/libraries/core/command/Functor.h

    r10768 r10817  
    249249
    250250            // see Functor::operator()()
    251             MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null)
     251            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
    252252            {
    253253                // call the function if an object was assigned
    … …  
    262262
    263263            // see Functor::getType()
    264             inline Functor::Type::Enum getType() const
     264            inline Functor::Type::Enum getType() const override
    265265                { return Functor::Type::Member; }
    266266
    … …  
    280280
    281281            // see Functor::setRawObjectPointer()
    282             inline void setRawObjectPointer(void* object)
     282            inline void setRawObjectPointer(void* object) override
    283283                { this->setObject((O*)object); }
    284284            // see Functor::getRawObjectPointer()
    285             inline void* getRawObjectPointer() const
     285            inline void* getRawObjectPointer() const override
    286286                { return this->object_; }
    287287
    288288            // see Functor::setSafeMode()
    289             inline void setSafeMode(bool bSafeMode)
     289            inline void setSafeMode(bool bSafeMode) override
    290290            {
    291291                if (bSafeMode == this->bSafeMode_)
    … …  
    309309
    310310            /// Will be called by Destroyable::~Destroyable() if the stored object is deleted and the Functor is in safe mode.
    311             inline void objectDeleted()
     311            inline void objectDeleted() override
    312312                { this->object_ = nullptr; }
    313313
    … …  
    328328
    329329            // see Functor::operator()()
    330             MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null)
     330            MultiType operator()(const MultiType& param1 = MultiType::Null, const MultiType& param2 = MultiType::Null, const MultiType& param3 = MultiType::Null, const MultiType& param4 = MultiType::Null, const MultiType& param5 = MultiType::Null) override
    331331            {
    332332                return (*this)((void*)nullptr, param1, param2, param3, param4, param5);
    … …  
    334334
    335335            // see Functor::getType()
    336             inline Functor::Type::Enum getType() const
     336            inline Functor::Type::Enum getType() const override
    337337                { return Functor::Type::Static; }
    338338
    339339            // see Functor::setRawObjectPointer()
    340             inline void setRawObjectPointer(void*)
     340            inline void setRawObjectPointer(void*) override
    341341                { orxout(internal_warning) << "Can't assign an object pointer to a static functor" << endl; }
    342342            // see Functor::getRawObjectPointer()
    343             inline void* getRawObjectPointer() const
     343            inline void* getRawObjectPointer() const override
    344344                { return nullptr; }
    345345
    346346            // see Functor::setSafeMode()
    347             inline void setSafeMode(bool) {}
     347            inline void setSafeMode(bool) override {}
    348348    };
    349349

  • code/branches/cpp11_v2/src/libraries/core/command/IOConsolePOSIX.h

    r8858 r10817  
    6565
    6666        // Methods from ShellListener
    67         void linesChanged();
    68         void lineAdded();
    69         void inputChanged();
    70         void cursorChanged();
    71         void executed();
    72         void exit();
     67        void linesChanged() override;
     68        void lineAdded() override;
     69        void inputChanged() override;
     70        void cursorChanged() override;
     71        void executed() override;
     72        void exit() override;
    7373
    7474        bool willPrintStatusLines();

  • code/branches/cpp11_v2/src/libraries/core/command/IOConsoleWindows.h

    r9676 r10817  
    6767
    6868        // Methods from ShellListener
    69         void linesChanged();
    70         void lineAdded();
    71         void inputChanged();
    72         void cursorChanged();
    73         void executed();
    74         void exit();
     69        void linesChanged() override;
     70        void lineAdded() override;
     71        void inputChanged() override;
     72        void cursorChanged() override;
     73        void executed() override;
     74        void exit() override;
    7575
    7676        void resetTerminalMode();

  • code/branches/cpp11_v2/src/libraries/core/command/Shell.h

    r10769 r10817  
    151151
    152152            // DevModeListener
    153             void devModeChanged(bool value);
     153            void devModeChanged(bool value) override;
    154154
    155155            void addToHistory(const std::string& command);
    … …  
    157157            void clearInput();
    158158            // BaseWriter
    159             virtual void printLine(const std::string& line, OutputLevel level);
     159            virtual void printLine(const std::string& line, OutputLevel level) override;
    160160
    161161            void configureInputBuffer();

  • code/branches/cpp11_v2/src/libraries/core/commandline/CommandLineIncludes.h

    r10535 r10817  
    6464            ~StaticallyInitializedCommandLineArgument() { delete argument_; }
    6565
    66             virtual void load()
     66            virtual void load() override
    6767                { CommandLineParser::addArgument(this->argument_); }
    6868
    69             virtual void unload()
     69            virtual void unload() override
    7070                { CommandLineParser::removeArgument(this->argument_); }
    7171

  • code/branches/cpp11_v2/src/libraries/core/config/ConfigFile.cc

    r10768 r10817  
    3838#include <iterator>
    3939#include <algorithm>
     40#include <fstream>
    4041
    4142#include "util/Convert.h"

  • code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryComment.h

    r9559 r10817  
    5656            inline virtual ~ConfigFileEntryComment() {}
    5757
    58             inline virtual const std::string& getName() const
     58            inline virtual const std::string& getName() const override
    5959                { return this->comment_; }
    6060
    61             inline virtual void setComment(const std::string& comment)
     61            inline virtual void setComment(const std::string& comment) override
    6262                { this->comment_ = comment; }
    6363
    64             inline virtual void setValue(const std::string& value)
     64            inline virtual void setValue(const std::string& value) override
    6565                {}
    66             inline virtual const std::string& getValue() const
     66            inline virtual const std::string& getValue() const override
    6767                { return BLANKSTRING; }
    6868
    69             inline void setString(bool bString)
     69            inline void setString(bool bString) override
    7070                {}
    7171
    72             inline virtual const std::string& getFileEntry() const
     72            inline virtual const std::string& getFileEntry() const override
    7373                { return this->comment_; }
    7474

  • code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryValue.h

    r9684 r10817  
    6969            inline virtual ~ConfigFileEntryValue() {}
    7070
    71             inline virtual const std::string& getName() const
     71            inline virtual const std::string& getName() const override
    7272                { return this->name_; }
    7373
    74             inline virtual void setComment(const std::string& comment)
     74            inline virtual void setComment(const std::string& comment) override
    7575                { this->additionalComment_ = comment; this->update(); }
    7676
    77             inline virtual void setValue(const std::string& value)
     77            inline virtual void setValue(const std::string& value) override
    7878                { this->value_ = value; this->update(); }
    79             inline virtual const std::string& getValue() const
     79            inline virtual const std::string& getValue() const override
    8080                { return this->value_; }
    8181
    82             inline void virtual setString(bool bString)
     82            inline void virtual setString(bool bString) override
    8383                { this->bString_ = bString; this->update(); }
    8484
    85             inline virtual const std::string& getFileEntry() const
     85            inline virtual const std::string& getFileEntry() const override
    8686                { return this->fileEntry_; }
    8787

  • code/branches/cpp11_v2/src/libraries/core/config/ConfigFileEntryVectorValue.h

    r9559 r10817  
    6767            inline ~ConfigFileEntryVectorValue() {}
    6868
    69             inline unsigned int getIndex() const
     69            inline unsigned int getIndex() const override
    7070                { return this->index_; }
    7171
    7272            /// Returns the "key" of the value (the name of the vector plus the index of the element)
    73             inline const std::string& getKeyString() const
     73            inline const std::string& getKeyString() const override
    7474                { return this->keyString_; }
    7575
    7676        private:
    77             void update();
     77            void update() override;
    7878
    7979            unsigned int index_;        ///< The index of the element in the vector

  • code/branches/cpp11_v2/src/libraries/core/config/ConfigValueContainer.h

    r10765 r10817  
    6868            inline ConfigValueCallback(void (T::*function) (void)) : function_(function) {}
    6969            inline virtual ~ConfigValueCallback() {}
    70             inline virtual void call(void* object)
     70            inline virtual void call(void* object) override
    7171            {
    7272                if (!IdentifierManager::getInstance().isCreatingHierarchy())

  • code/branches/cpp11_v2/src/libraries/core/input/HalfAxis.h

    r10768 r10817  
    5656        using Button::execute;
    5757        bool execute();
    58         bool addParamCommand(ParamCommand* command);
    59         void clear();
     58        bool addParamCommand(ParamCommand* command) override;
     59        void clear() override;
    6060        void reset();
    6161

  • code/branches/cpp11_v2/src/libraries/core/input/InputBuffer.h

    r9667 r10817  
    6666        { }
    6767        virtual ~InputBufferListenerTuple() { }
    68         void callFunction()
     68        void callFunction() override
    6969        {
    7070            (listener_->*function_)();
    … …  
    165165                { if (this->cursor_ > 0) { --this->cursor_; } }
    166166
    167             void buttonPressed(const KeyEvent& evt);
     167            void buttonPressed(const KeyEvent& evt) override;
    168168
    169169        private:
    170170            bool charIsAllowed(const char& input);
    171171
    172             void buttonHeld   (const KeyEvent& evt);
     172            void buttonHeld   (const KeyEvent& evt) override;
    173173            void processKey   (const KeyEvent& evt);
    174174
    175             void keyboardUpdated(float dt);
     175            void keyboardUpdated(float dt) override;
    176176
    177177            std::string buffer_;

  • code/branches/cpp11_v2/src/libraries/core/input/InputCommands.h

    r10768 r10817  
    7676    {
    7777    public:
    78         bool execute(float abs = 1.0f, float rel = 1.0f);
    79         CommandEvaluation* getEvaluation();
    80         virtual SimpleCommand* clone() { return new SimpleCommand(*this); }
     78        bool execute(float abs = 1.0f, float rel = 1.0f) override;
     79        CommandEvaluation* getEvaluation() override;
     80        virtual SimpleCommand* clone() override { return new SimpleCommand(*this); }
    8181
    8282        CommandEvaluation evaluation_;
    … …  
    104104    public:
    105105        ParamCommand() : scale_(1.0f), paramCommand_(nullptr) { }
    106         bool execute(float abs = 1.0f, float rel = 1.0f);
    107         CommandEvaluation* getEvaluation();
    108         virtual ParamCommand* clone() { return new ParamCommand(*this); }
     106        bool execute(float abs = 1.0f, float rel = 1.0f) override;
     107        CommandEvaluation* getEvaluation() override;
     108        virtual ParamCommand* clone() override { return new ParamCommand(*this); }
    109109
    110110        float scale_;

  • code/branches/cpp11_v2/src/libraries/core/input/InputDevice.h

    r8858 r10817  
    153153
    154154        //! Captures OIS events (which then get distributed to the derived class) and creates the button held events
    155         void update(const Clock& time)
     155        void update(const Clock& time) override
    156156        {
    157157            oisDevice_->capture();
    … …  
    160160            for (unsigned int iB = 0; iB < pressedButtons_.size(); ++iB)
    161161                for (unsigned int iS = 0; iS < inputStates_.size(); ++iS)
    162                     inputStates_[iS]->buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
     162                    inputStates_[iS]->template buttonEvent<ButtonEvent::THold, typename Traits::ButtonTypeParam>(
    163163                        this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(pressedButtons_[iB]));
    164164
    … …  
    171171
    172172        //! Clears the list of pressed buttons and calls the derived class's method
    173         void clearBuffers()
     173        void clearBuffers() override
    174174        {
    175175            pressedButtons_.clear();
    … …  
    180180        OISDeviceClass* getOISDevice()   { return this->oisDevice_; }
    181181        // Returns the name of the derived class as string
    182         std::string getClassName() const { return DeviceClass::getClassNameImpl(); }
     182        std::string getClassName() const override { return DeviceClass::getClassNameImpl(); }
    183183
    184184    protected:
    … …  
    197197            // Call states
    198198            for (unsigned int i = 0; i < inputStates_.size(); ++i)
    199                 inputStates_[i]->buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
     199                inputStates_[i]->template buttonEvent<ButtonEvent::TPress, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
    200200        }
    201201
    … …  
    219219            // Call states
    220220            for (unsigned int i = 0; i < inputStates_.size(); ++i)
    221                 inputStates_[i]->buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
     221                inputStates_[i]->template buttonEvent<ButtonEvent::TRelease, typename Traits::ButtonTypeParam>(this->getDeviceID(), static_cast<DeviceClass*>(this)->getButtonEventArg(button));
    222222        }
    223223

  • code/branches/cpp11_v2/src/libraries/core/input/InputManager.h

    r10775 r10817  
    208208
    209209        // From WindowEventListener
    210         void windowFocusChanged(bool bFocus);
     210        void windowFocusChanged(bool bFocus) override;
    211211
    212212    private: // variables

  • code/branches/cpp11_v2/src/libraries/core/input/InputState.h

    r10775 r10817  
    157157        ~InputState() { }
    158158
    159         void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
     159        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
    160160
    161161        //! Sets the priority (only to be used by the InputManager!)

  • code/branches/cpp11_v2/src/libraries/core/input/JoyStick.h

    r9667 r10817  
    7777
    7878    private:
    79         void calibrationStarted();
    80         void calibrationStopped();
     79        void calibrationStarted() override;
     80        void calibrationStopped() override;
    8181        void evaluateCalibration();
    8282
    … …  
    8686
    8787        //! OIS event handler
    88         bool buttonPressed (const OIS::JoyStickEvent &arg, int button)
     88        bool buttonPressed (const OIS::JoyStickEvent &arg, int button) override
    8989        {
    9090            super::buttonPressed(static_cast<JoyStickButtonCode::ByEnum>(button));
    … …  
    9393
    9494        //! OIS event handler
    95         bool buttonReleased(const OIS::JoyStickEvent &arg, int button)
     95        bool buttonReleased(const OIS::JoyStickEvent &arg, int button) override
    9696        {
    9797            super::buttonReleased(static_cast<JoyStickButtonCode::ByEnum>(button));
    … …  
    9999        }
    100100
    101         bool axisMoved     (const OIS::JoyStickEvent &arg, int axis);
    102         bool sliderMoved   (const OIS::JoyStickEvent &arg, int id);
    103         bool povMoved      (const OIS::JoyStickEvent &arg, int id);
     101        bool axisMoved     (const OIS::JoyStickEvent &arg, int axis) override;
     102        bool sliderMoved   (const OIS::JoyStickEvent &arg, int id) override;
     103        bool povMoved      (const OIS::JoyStickEvent &arg, int id) override;
    104104        //! OIS event handler (don't remove that because of OIS version issues!)
    105         bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) { return true; }
     105        bool vector3Moved  (const OIS::JoyStickEvent &arg, int id) override { return true; }
    106106
    107107        //! Returns the class name as string

  • code/branches/cpp11_v2/src/libraries/core/input/KeyBinder.h

    r10771 r10817  
    8484        void compilePointerLists();
    8585        // from JoyStickQuantityListener interface
    86         virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
    87 
    88         void allDevicesUpdated(float dt);
    89         void mouseUpdated(float dt);
    90         void joyStickUpdated(unsigned int joyStick, float dt);
     86        virtual void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
     87
     88        void allDevicesUpdated(float dt) override;
     89        void mouseUpdated(float dt) override;
     90        void joyStickUpdated(unsigned int joyStick, float dt) override;
    9191        // internal
    9292        void tickHalfAxis(HalfAxis& halfAxis);
    9393
    94         void buttonPressed (const KeyEvent& evt);
    95         void buttonReleased(const KeyEvent& evt);
    96         void buttonHeld    (const KeyEvent& evt);
    97 
    98         void buttonPressed (MouseButtonCode::ByEnum button);
    99         void buttonReleased(MouseButtonCode::ByEnum button);
    100         void buttonHeld    (MouseButtonCode::ByEnum button);
    101         void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize);
    102         void mouseScrolled (int abs, int rel);
    103 
    104         void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button);
    105         void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button);
    106         void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button);
    107         void axisMoved     (unsigned int device, unsigned int axis, float value);
     94        void buttonPressed (const KeyEvent& evt) override;
     95        void buttonReleased(const KeyEvent& evt) override;
     96        void buttonHeld    (const KeyEvent& evt) override;
     97
     98        void buttonPressed (MouseButtonCode::ByEnum button) override;
     99        void buttonReleased(MouseButtonCode::ByEnum button) override;
     100        void buttonHeld    (MouseButtonCode::ByEnum button) override;
     101        void mouseMoved    (IntVector2 abs, IntVector2 rel, IntVector2 clippingSize) override;
     102        void mouseScrolled (int abs, int rel) override;
     103
     104        void buttonPressed (unsigned int device, JoyStickButtonCode::ByEnum button) override;
     105        void buttonReleased(unsigned int device, JoyStickButtonCode::ByEnum button) override;
     106        void buttonHeld    (unsigned int device, JoyStickButtonCode::ByEnum button) override;
     107        void axisMoved     (unsigned int device, unsigned int axis, float value) override;
    108108
    109109    protected: // variables

  • code/branches/cpp11_v2/src/libraries/core/input/KeyDetector.h

    r8729 r10817  
    5151
    5252        void callback(const std::string& name);
    53         void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList);
     53        void JoyStickQuantityChanged(const std::vector<JoyStick*>& joyStickList) override;
    5454        void assignCommands();
    5555

  • code/branches/cpp11_v2/src/libraries/core/input/Keyboard.h

    r8729 r10817  
    7575        }
    7676
    77         bool keyPressed(const OIS::KeyEvent& arg);
    78         bool keyReleased(const OIS::KeyEvent& arg);
     77        bool keyPressed(const OIS::KeyEvent& arg) override;
     78        bool keyReleased(const OIS::KeyEvent& arg) override;
    7979
    8080        //! Returns the class name as string

  • code/branches/cpp11_v2/src/libraries/core/input/Mouse.h

    r7809 r10817  
    7474    private:
    7575        //! OIS event handler
    76         bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id)
     76        bool mousePressed(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
    7777        {
    7878            super::buttonPressed(static_cast<MouseButtonCode::ByEnum>(id));
    … …  
    8181
    8282        //! OIS event handler
    83         bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id)
     83        bool mouseReleased(const OIS::MouseEvent &arg, OIS::MouseButtonID id) override
    8484        {
    8585            super::buttonReleased(static_cast<MouseButtonCode::ByEnum>(id));
    … …  
    8787        }
    8888
    89         bool mouseMoved(const OIS::MouseEvent &arg);
     89        bool mouseMoved(const OIS::MouseEvent &arg) override;
    9090
    91         void windowResized(unsigned int newWidth, unsigned int newHeight);
     91        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
    9292
    9393        // Returns the class name as string

  • code/branches/cpp11_v2/src/libraries/core/module/StaticInitializationHandlerIncludes.h

    r10535 r10817  
    5353            ~StaticallyInitializedStaticInitializationHandler() { delete handler_; }
    5454
    55             virtual void load();
    56             virtual void unload();
     55            virtual void load() override;
     56            virtual void unload() override;
    5757
    5858            inline StaticInitializationHandler& getHandler()

  • code/branches/cpp11_v2/src/libraries/core/object/DestroyLaterManager.h

    r10769 r10817  
    4545            virtual ~DestroyLaterManager();
    4646
    47             virtual void preUpdate(const Clock& time) { /*no action*/ }
    48             virtual void postUpdate(const Clock& time);
     47            virtual void preUpdate(const Clock& time) override { /*no action*/ }
     48            virtual void postUpdate(const Clock& time) override;
    4949
    5050            void retain(Destroyable* instance)

  • code/branches/cpp11_v2/src/libraries/core/object/IteratorBase.h

    r10774 r10817  
    175175                @param object The object to compare with
    176176            */
    177             virtual void removedElement(ObjectListBaseElement* element)
     177            virtual void removedElement(ObjectListBaseElement* element) override
    178178            {
    179179                if (this->element_ == element)

  • code/branches/cpp11_v2/src/libraries/core/object/ObjectListBase.h

    r10768 r10817  
    8282            ObjectListElement(T* object) : ObjectListBaseElement(static_cast<Listable*>(object)), object_(object) {}
    8383
    84             virtual void changeContext(Context* oldContext, Context* newContext)
     84            virtual void changeContext(Context* oldContext, Context* newContext) override
    8585            {
    8686                // add object to new context, but only if this element belongs exactly to the old context (and not to a sub-context to avoid re-adding objects

  • code/branches/cpp11_v2/src/libraries/core/object/WeakPtr.h

    r10770 r10817  
    230230        private:
    231231            /// Will be called by Destroyable::~Destroyable() if the stored object is deleted. Resets the wrapped pointer and executes the callback.
    232             inline void objectDeleted()
     232            inline void objectDeleted() override
    233233            {
    234234                this->base_ = nullptr;

  • code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonIncludes.h

    r10765 r10817  
    8787            ~StaticallyInitializedScopedSingletonWrapper() { delete wrapper_; }
    8888
    89             virtual void load();
    90             virtual void unload();
     89            virtual void load() override;
     90            virtual void unload() override;
    9191
    9292            inline ScopedSingletonWrapper& getWrapper()

  • code/branches/cpp11_v2/src/libraries/core/singleton/ScopedSingletonWrapper.h

    r10765 r10817  
    102102
    103103        //! Called if the Scope of the Singleton gets active (creates the instance)
    104         void activated()
     104        void activated() override
    105105        {
    106106            assert(singletonPtr_ == nullptr);
    … …  
    109109
    110110        //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
    111         void deactivated()
     111        void deactivated() override
    112112        {
    113113            assert(singletonPtr_ != nullptr);
    … …  
    157157
    158158        //! Called if the Scope of the Singleton gets active (creates the instance)
    159         void activated()
     159        void activated() override
    160160        {
    161161            assert(singletonPtr_ == nullptr);
    … …  
    169169
    170170        //! Called if the Scope of this Singleton gets deactivated (destroys the instance)
    171         void deactivated()
     171        void deactivated() override
    172172        {
    173173            if (singletonPtr_ != nullptr)

  • code/branches/cpp11_v2/src/libraries/network/Client.h

    r8858 r10817  
    7676    static Client* getInstance(){ return singletonPtr_s; } // tolua_export
    7777
    78     bool establishConnection();
     78    bool establishConnection() override;
    7979    void setDestination( const std::string& serverAddress, unsigned int port ); // tolua_export
    80     bool closeConnection();
    81     void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID);
    82     virtual bool sendPacket( packet::Packet* packet ){ return packet->send( static_cast<Host*>(this) ); }
    83     virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
    84     virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
    85     virtual void printRTT();
     80    bool closeConnection() override;
     81    void queuePacket(ENetPacket* packet, int clientID, uint8_t channelID) override;
     82    virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); }
     83    virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
     84    virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
     85    virtual void printRTT() override;
    8686
    8787    void update(const Clock& time);
    8888  protected:
    89     virtual void connectionClosed();
     89    virtual void connectionClosed() override;
    9090  private:
    9191    Client(const Client& copy); // not used
    92     virtual bool isServer_(){return false;}
    93     void processPacket(packet::Packet* packet);
     92    virtual bool isServer_() override{return false;}
     93    void processPacket(packet::Packet* packet) override;
    9494
    9595    static Client* singletonPtr_s;

  • code/branches/cpp11_v2/src/libraries/network/ClientConnection.h

    r8327 r10817  
    5757    uint32_t getRTT();
    5858  private:
    59     virtual void addPeer(uint32_t peerID);
    60     virtual void removePeer(uint32_t peerID);
     59    virtual void addPeer(uint32_t peerID) override;
     60    virtual void removePeer(uint32_t peerID) override;
    6161
    6262    bool disconnectConnection();

  • code/branches/cpp11_v2/src/libraries/network/GamestateManager.h

    r10774 r10817  
    8383    ~GamestateManager();
    8484
    85     virtual bool      addGamestate(packet::Gamestate *gs, unsigned int peerID);
    86     virtual bool      ackGamestate(unsigned int gamestateID, unsigned int peerID);
    87     virtual uint32_t  getLastReceivedGamestateID( unsigned int peerID );
    88     virtual uint32_t  getCurrentGamestateID(){ if( currentGamestate_) return currentGamestate_->getID(); else return GAMESTATEID_INITIAL; }
     85    virtual bool      addGamestate(packet::Gamestate *gs, unsigned int peerID) override;
     86    virtual bool      ackGamestate(unsigned int gamestateID, unsigned int peerID) override;
     87    virtual uint32_t  getLastReceivedGamestateID( unsigned int peerID ) override;
     88    virtual uint32_t  getCurrentGamestateID() override{ if( currentGamestate_) return currentGamestate_->getID(); else return GAMESTATEID_INITIAL; }
    8989
    9090    bool processGamestates();

  • code/branches/cpp11_v2/src/libraries/network/LANDiscoverable.cc

    r10768 r10817  
    109109      {
    110110        case ENET_EVENT_TYPE_CONNECT:
    111             orxout(verbose, context::network) << "Received LAN discovery connect from client " << event.peer->host->receivedAddress << endl;
     111            //orxout(verbose, context::network) << "Received LAN discovery connect from client " << event.peer->host->receivedAddress << endl;
    112112            break;
    113113        case ENET_EVENT_TYPE_DISCONNECT:
    … …  
    117117          if( strcmp( LAN_DISCOVERY_MESSAGE, (char*)event.packet->data ) == 0 )      // check for a suitable orxonox client
    118118          {
    119             orxout(internal_info, context::network) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << endl;
     119            //orxout(internal_info, context::network) << "Received LAN discovery message from client " << event.peer->host->receivedAddress << endl;
    120120            packet::ServerInformation info;
    121121            info.setServerName(this->ownName);

  • code/branches/cpp11_v2/src/libraries/network/NetworkFunction.h

    r10768 r10817  
    114114
    115115    // ignore the objectID because its a static function
    116     virtual bool call(uint32_t objectID){ (*this->functor_)(); return true; }
    117     virtual bool call(uint32_t objectID, const MultiType& mt1){ (*this->functor_)(mt1); return true; }
    118     virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2){ (*this->functor_)(mt1, mt2); return true; }
    119     virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3){ (*this->functor_)(mt1, mt2, mt3); return true; }
    120     virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4){ (*this->functor_)(mt1, mt2, mt3, mt4); return true; }
    121     virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5){ (*this->functor_)(mt1, mt2, mt3, mt4, mt5); return true; }
     116    virtual bool call(uint32_t objectID) override{ (*this->functor_)(); return true; }
     117    virtual bool call(uint32_t objectID, const MultiType& mt1) override{ (*this->functor_)(mt1); return true; }
     118    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override{ (*this->functor_)(mt1, mt2); return true; }
     119    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override{ (*this->functor_)(mt1, mt2, mt3); return true; }
     120    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override{ (*this->functor_)(mt1, mt2, mt3, mt4); return true; }
     121    virtual bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override{ (*this->functor_)(mt1, mt2, mt3, mt4, mt5); return true; }
    122122
    123123  private:
    … …  
    142142    { }
    143143
    144     inline bool call(uint32_t objectID)
     144    inline bool call(uint32_t objectID) override
    145145    {
    146146      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    152152        return false;
    153153    }
    154     inline bool call(uint32_t objectID, const MultiType& mt1)
     154    inline bool call(uint32_t objectID, const MultiType& mt1) override
    155155    {
    156156      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    162162        return false;
    163163    }
    164     inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2)
     164    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2) override
    165165    {
    166166      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    172172        return false;
    173173    }
    174     inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3)
     174    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3) override
    175175    {
    176176      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    182182        return false;
    183183    }
    184     inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4)
     184    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4) override
    185185    {
    186186      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )
    … …  
    192192        return false;
    193193    }
    194     inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5)
     194    inline bool call(uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5) override
    195195    {
    196196      if ( Synchronisable::getSynchronisable(objectID)!=nullptr )

  • code/branches/cpp11_v2/src/libraries/network/NetworkFunctionIncludes.h

    r10774 r10817  
    5656            ~StaticallyInitializedNetworkFunction() { delete function_; }
    5757
    58             virtual void load();
    59             virtual void unload();
     58            virtual void load() override;
     59            virtual void unload() override;
    6060
    6161            inline NetworkFunctionBase& getFunction()

  • code/branches/cpp11_v2/src/libraries/network/NetworkStaticInitializationHandler.h

    r10624 r10817  
    3939    {
    4040        public:
    41             virtual void setupHandler();
    42             virtual void shutdownHandler();
     41            virtual void setupHandler() override;
     42            virtual void shutdownHandler() override;
    4343
    44             virtual void loadModule(ModuleInstance* module);
    45             virtual void unloadModule(ModuleInstance* module);
     44            virtual void loadModule(ModuleInstance* module) override;
     45            virtual void unloadModule(ModuleInstance* module) override;
    4646    };
    4747}

  • code/branches/cpp11_v2/src/libraries/network/Server.h

    r10622 r10817  
    6161    void open();
    6262    void close();
    63     void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID);
    64     virtual bool sendPacket( packet::Packet* packet ){ return packet->send( static_cast<Host*>(this) ); }
     63    void queuePacket(ENetPacket *packet, int clientID, uint8_t channelID) override;
     64    virtual bool sendPacket( packet::Packet* packet ) override{ return packet->send( static_cast<Host*>(this) ); }
    6565    void update(const Clock& time);
    6666    unsigned int getRTT(unsigned int clientID);
    67     virtual void printRTT();
     67    virtual void printRTT() override;
    6868    float getPacketLoss(unsigned int clientID);
    6969    int getClientCount() { return this->clientIDs_.size();}
    … …  
    7373    void updateGamestate();
    7474  private:
    75     virtual bool isServer_(){return true;}
     75    virtual bool isServer_() override{return true;}
    7676    unsigned int playerID(){return 0;}
    7777
    78     void addPeer(uint32_t peerID);
    79     void removePeer(uint32_t peerID);
    80     void processPacket(packet::Packet* packet);
     78    void addPeer(uint32_t peerID) override;
     79    void removePeer(uint32_t peerID) override;
     80    void processPacket(packet::Packet* packet) override;
    8181
    8282    bool createClient(int clientID);
    … …  
    8585    bool sendObjectDeletes();
    8686    bool isValidTarget(unsigned int targetID);
    87     virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
    88     virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID);
     87    virtual void doSendChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
     88    virtual void doReceiveChat(const std::string& message, unsigned int sourceID, unsigned int targetID) override;
    8989    void syncClassid(unsigned int clientID);
    9090

  • code/branches/cpp11_v2/src/libraries/network/TrafficControl.h

    r10769 r10817  
    109109
    110110    //ClientConnectionListener functions
    111     virtual void clientConnected(unsigned int clientID){};
    112     virtual void clientDisconnected(unsigned int clientID);
     111    virtual void clientConnected(unsigned int clientID) override{};
     112    virtual void clientDisconnected(unsigned int clientID) override;
    113113
    114114

  • code/branches/cpp11_v2/src/libraries/network/packet/Acknowledgement.h

    r7801 r10817  
    4646  ~Acknowledgement();
    4747
    48   inline unsigned int getSize() const;
    49   virtual bool process(orxonox::Host* host);
     48  inline unsigned int getSize() const override;
     49  virtual bool process(orxonox::Host* host) override;
    5050
    5151  unsigned int getAckID();

  • code/branches/cpp11_v2/src/libraries/network/packet/Chat.h

    r8858 r10817  
    4949
    5050  /* get size of packet */
    51   inline unsigned int getSize() const;
     51  inline unsigned int getSize() const override;
    5252
    5353  /* process chat message packet and remove it afterwards */
    54   virtual bool process(orxonox::Host* host);
     54  virtual bool process(orxonox::Host* host) override;
    5555
    5656  /* Get the length of the message (not the full size of the packet) */

  • code/branches/cpp11_v2/src/libraries/network/packet/ClassID.h

    r7801 r10817  
    4747  ~ClassID();
    4848
    49   uint32_t getSize() const;
    50   virtual bool process(orxonox::Host* host);
     49  uint32_t getSize() const override;
     50  virtual bool process(orxonox::Host* host) override;
    5151
    5252private:

  • code/branches/cpp11_v2/src/libraries/network/packet/DeleteObjects.h

    r7801 r10817  
    4848  bool fetchIDs();
    4949
    50   inline unsigned int getSize() const;
    51   virtual bool process(orxonox::Host* host);
     50  inline unsigned int getSize() const override;
     51  virtual bool process(orxonox::Host* host) override;
    5252
    5353private:

  • code/branches/cpp11_v2/src/libraries/network/packet/FunctionCalls.h

    r10624 r10817  
    5252  ~FunctionCalls();
    5353
    54   inline unsigned int getSize() const
     54  inline unsigned int getSize() const override
    5555    { assert(!this->isDataENetAllocated()); return currentSize_; }
    56   virtual bool process(orxonox::Host* host);
     56  virtual bool process(orxonox::Host* host) override;
    5757
    5858  void addCall( uint32_t networkID, uint32_t objectID, const MultiType& mt1, const MultiType& mt2, const MultiType& mt3, const MultiType& mt4, const MultiType& mt5);
    59   virtual bool send(orxonox::Host* host);
     59  virtual bool send(orxonox::Host* host) override;
    6060private:
    6161  std::queue<orxonox::FunctionCall> functionCalls_;

  • code/branches/cpp11_v2/src/libraries/network/packet/FunctionIDs.h

    r7801 r10817  
    4747  ~FunctionIDs();
    4848
    49   virtual uint32_t getSize() const;
    50   virtual bool process(orxonox::Host* host);
     49  virtual uint32_t getSize() const override;
     50  virtual bool process(orxonox::Host* host) override;
    5151
    5252private:

  • code/branches/cpp11_v2/src/libraries/network/packet/Gamestate.h

    r10768 r10817  
    138138//     void rawDiff( uint8_t* newdata, uint8_t* data, uint8_t* basedata, uint32_t datalength, uint32_t baselength);
    139139//     inline uint32_t findObject( const SynchronisableHeader& header, uint8_t* mem, uint32_t dataLength, uint32_t startPosition = 0 );
    140     virtual uint32_t getSize() const;
    141     virtual bool process(orxonox::Host* host);
     140    virtual uint32_t getSize() const override;
     141    virtual bool process(orxonox::Host* host) override;
    142142    uint32_t calcGamestateSize(uint32_t id, uint8_t mode=0x0);
    143143//     inline void diffObject( uint8_t*& newData, uint8_t*& origData, uint8_t*& baseData, SynchronisableHeader& objectHeader, std::vector<uint32_t>::iterator& sizes );

  • code/branches/cpp11_v2/src/libraries/network/packet/Welcome.h

    r8706 r10817  
    4545  virtual ~Welcome();
    4646
    47   uint8_t *getData();
    48   inline unsigned int getSize() const;
    49   virtual bool process(orxonox::Host* host);
     47  uint8_t *getData() override;
     48  inline unsigned int getSize() const override;
     49  virtual bool process(orxonox::Host* host) override;
    5050
    5151private:

  • code/branches/cpp11_v2/src/libraries/network/synchronisable/NetworkCallback.h

    r6417 r10817  
    5353      NetworkCallback(T* object, void (T::*function) (void)) : object_(object), function_(function) {}
    5454      virtual ~NetworkCallback() {}
    55       virtual void call()
     55      virtual void call() override
    5656        { (this->object_->*function_)(); }
    5757
    … …  
    6868      NetworkCallbackNotify() {}
    6969      virtual ~NetworkCallbackNotify() {}
    70       virtual void call()
     70      virtual void call() override
    7171        { (this->object_->*function_)( this->oldValue_ ); }
    7272      void setOldValue(const U& value){ this->oldValue_ = value; }

  • code/branches/cpp11_v2/src/libraries/network/synchronisable/SynchronisableVariable.h

    r10768 r10817  
    7474      virtual ~SynchronisableVariable();
    7575
    76       virtual inline uint8_t getMode(){ return mode_; }
    77       virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode);
    78       virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false);
    79       virtual inline uint32_t getSize(uint8_t mode);
    80       virtual inline void* getReference(){ return static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->variable_)); }
     76      virtual inline uint8_t getMode() override{ return mode_; }
     77      virtual inline uint32_t getData(uint8_t*& mem, uint8_t mode) override;
     78      virtual inline void putData(uint8_t*& mem, uint8_t mode, bool forceCallback = false) override;
     79      virtual inline uint32_t getSize(uint8_t mode) override;
     80      virtual inline void* getReference() override{ return static_cast<void*>(const_cast<typename Loki::TypeTraits<T>::UnqualifiedType*>(&this->variable_)); }
    8181    protected:
    8282      T&                       variable_;

  • code/branches/cpp11_v2/src/libraries/tools/BulletDebugDrawer.h

    r10733 r10817  
    2323            BulletDebugDrawer(Ogre::SceneManager* sceneManager);
    2424            ~BulletDebugDrawer();
    25             virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color);
     25            virtual void drawLine(const btVector3& from, const btVector3& to, const btVector3& color) override;
    2626//            virtual void drawTriangle(const btVector3& v0, const btVector3& v1, const btVector3& v2, const btVector3& color, btScalar);
    27             virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color);
    28             virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color);
    29             virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btVector3& color);
    30             virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btTransform& trans, const btVector3& color);
    31             virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color);
    32             virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color);
     27            virtual void drawSphere (const btVector3& p, btScalar radius, const btVector3& color) override;
     28            virtual void drawSphere(btScalar radius, const btTransform& transform, const btVector3& color) override;
     29            virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btVector3& color) override;
     30            virtual void drawBox(const btVector3& bbMin, const btVector3& bbMax, const btTransform& trans, const btVector3& color) override;
     31            virtual void drawCylinder(btScalar radius, btScalar halfHeight, int upAxis, const btTransform& transform, const btVector3& color) override;
     32            virtual void drawCone(btScalar radius, btScalar height, int upAxis, const btTransform& transform, const btVector3& color) override;
    3333//            virtual void drawPlane(const btVector3& planeNormal, btScalar planeConst, const btTransform& transform, const btVector3& color);
    3434
    35             virtual void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color);
     35            virtual void drawContactPoint(const btVector3& PointOnB, const btVector3& normalOnB, btScalar distance, int lifeTime, const btVector3& color) override;
    3636
    37             virtual void reportErrorWarning(const char* warningString);
    38             virtual void draw3dText(const btVector3& location, const char* textString);
     37            virtual void reportErrorWarning(const char* warningString) override;
     38            virtual void draw3dText(const btVector3& location, const char* textString) override;
    3939
    40             virtual void setDebugMode(int debugMode);
    41             virtual int getDebugMode() const;
     40            virtual void setDebugMode(int debugMode) override;
     41            virtual int getDebugMode() const override;
    4242
    4343            void configure(bool bFill, float fillAlpha);
    4444
    4545        protected:
    46             bool frameStarted(const Ogre::FrameEvent& evt);
    47             bool frameEnded(const Ogre::FrameEvent& evt);
     46            bool frameStarted(const Ogre::FrameEvent& evt) override;
     47            bool frameEnded(const Ogre::FrameEvent& evt) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/libraries/tools/DynamicLines.h

    r5781 r10817  
    8484    protected:
    8585        /// Implementation DynamicRenderable, creates a simple vertex-only decl
    86         virtual void createVertexDeclaration();
     86        virtual void createVertexDeclaration() override;
    8787        /// Implementation DynamicRenderable, pushes point list out to hardware memory
    88         virtual void fillHardwareBuffers();
     88        virtual void fillHardwareBuffers() override;
    8989
    9090    private:

  • code/branches/cpp11_v2/src/libraries/tools/DynamicRenderable.h

    r5781 r10817  
    6161
    6262        /// Implementation of SimpleRenderable
    63         virtual Real getBoundingRadius(void) const;
     63        virtual Real getBoundingRadius(void) const override;
    6464        /// Implementation of SimpleRenderable
    65         virtual Real getSquaredViewDepth(const Camera* cam) const;
     65        virtual Real getSquaredViewDepth(const Camera* cam) const override;
    6666
    6767    protected:

  • code/branches/cpp11_v2/src/libraries/tools/ParticleInterface.h

    r10624 r10817  
    7676
    7777        protected:
    78             virtual void changedTimeFactor(float factor_new, float factor_old);
     78            virtual void changedTimeFactor(float factor_new, float factor_old) override;
    7979
    8080        private:

  • code/branches/cpp11_v2/src/libraries/tools/ResourceCollection.h

    r9667 r10817  
    4444        virtual ~ResourceCollection();
    4545
    46         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    4848        void setResourceGroup(const std::string& resourceGroup);

  • code/branches/cpp11_v2/src/libraries/tools/ResourceLocation.h

    r9667 r10817  
    4646        virtual ~ResourceLocation();
    4747
    48         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     48        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4949
    5050        void setPath(const std::string& path) { path_ = path; }

  • code/branches/cpp11_v2/src/libraries/tools/Shader.h

    r10768 r10817  
    8787                { return this->scenemanager_; }
    8888
    89             virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera);
     89            virtual void cameraChanged(Ogre::Viewport* viewport, Ogre::Camera* oldCamera) override;
    9090
    9191            void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, float value);
    9292            void setParameter(unsigned short technique, unsigned short pass, const std::string& parameter, int value);
    9393
    94             virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr);
     94            virtual void notifyMaterialRender(Ogre::uint32 pass_id, Ogre::MaterialPtr& materialPtr) override;
    9595
    9696        private:

  • code/branches/cpp11_v2/src/libraries/tools/Timer.h

    r9667 r10817  
    175175
    176176        protected:
    177             virtual float getTimeFactor();
     177            virtual float getTimeFactor() override;
    178178    };
    179179}

  • code/branches/cpp11_v2/src/libraries/util/ExprParser.cc

    r8351 r10817  
    402402            {
    403403                this->failed_ = true;
    404                 return '\0';
     404                return str;
    405405            }
    406406        };

  • code/branches/cpp11_v2/src/libraries/util/MultiType.h

    r10768 r10817  
    428428            }
    429429            /// Creates a new value container (works only with specialized types).
    430             template <typename T> inline void createNewValueContainer(const T& value) { /* STATIC ASSERT */ *****value; return false; }
     430            template <typename T> inline void createNewValueContainer(const T& value) { /* STATIC ASSERT */ *****value; }
    431431
    432432            MT_ValueBase* value_; //!< A pointer to the value container

  • code/branches/cpp11_v2/src/libraries/util/MultiTypeValue.h

    r10768 r10817  
    5858
    5959        /// Creates a copy of itself.
    60         inline MT_ValueBase* clone() const { return new MT_Value<T>(this->value_, this->type_); }
     60        inline MT_ValueBase* clone() const override { return new MT_Value<T>(this->value_, this->type_); }
    6161
    6262        /// Resets the current value to the default.
    63         inline void reset() { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
    64 
    65         inline bool getValue(char*                 value) const { return convertValue<T, char                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    66         inline bool getValue(unsigned char*        value) const { return convertValue<T, unsigned char       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    67         inline bool getValue(short*                value) const { return convertValue<T, short               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    68         inline bool getValue(unsigned short*       value) const { return convertValue<T, unsigned short      >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    69         inline bool getValue(int*                  value) const { return convertValue<T, int                 >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    70         inline bool getValue(unsigned int*         value) const { return convertValue<T, unsigned int        >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    71         inline bool getValue(long*                 value) const { return convertValue<T, long                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    72         inline bool getValue(unsigned long*        value) const { return convertValue<T, unsigned long       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    73         inline bool getValue(long long*            value) const { return convertValue<T, long long           >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    74         inline bool getValue(unsigned long long*   value) const { return convertValue<T, unsigned long long  >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    75         inline bool getValue(float*                value) const { return convertValue<T, float               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    76         inline bool getValue(double*               value) const { return convertValue<T, double              >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    77         inline bool getValue(long double*          value) const { return convertValue<T, long double         >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    78         inline bool getValue(bool*                 value) const { return convertValue<T, bool                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    79         inline bool getValue(void**                value) const { return convertValue<T, void*               >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    80         inline bool getValue(std::string*          value) const { return convertValue<T, std::string         >(value, value_, NilValue<std::string>         ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    81         inline bool getValue(orxonox::Vector2*     value) const { return convertValue<T, orxonox::Vector2    >(value, value_, NilValue<orxonox::Vector2>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    82         inline bool getValue(orxonox::Vector3*     value) const { return convertValue<T, orxonox::Vector3    >(value, value_, NilValue<orxonox::Vector3>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    83         inline bool getValue(orxonox::Vector4*     value) const { return convertValue<T, orxonox::Vector4    >(value, value_, NilValue<orxonox::Vector4>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    84         inline bool getValue(orxonox::ColourValue* value) const { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    85         inline bool getValue(orxonox::Quaternion*  value) const { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    86         inline bool getValue(orxonox::Radian*      value) const { return convertValue<T, orxonox::Radian     >(value, value_, NilValue<orxonox::Radian>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    87         inline bool getValue(orxonox::Degree*      value) const { return convertValue<T, orxonox::Degree     >(value, value_, NilValue<orxonox::Degree>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     63        inline void reset() override { this->value_ = zeroise<T>(); bLastConversionSuccessful = true; }
     64
     65        inline bool getValue(char*                 value) const override { return convertValue<T, char                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     66        inline bool getValue(unsigned char*        value) const override { return convertValue<T, unsigned char       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     67        inline bool getValue(short*                value) const override { return convertValue<T, short               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     68        inline bool getValue(unsigned short*       value) const override { return convertValue<T, unsigned short      >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     69        inline bool getValue(int*                  value) const override { return convertValue<T, int                 >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     70        inline bool getValue(unsigned int*         value) const override { return convertValue<T, unsigned int        >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     71        inline bool getValue(long*                 value) const override { return convertValue<T, long                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     72        inline bool getValue(unsigned long*        value) const override { return convertValue<T, unsigned long       >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     73        inline bool getValue(long long*            value) const override { return convertValue<T, long long           >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     74        inline bool getValue(unsigned long long*   value) const override { return convertValue<T, unsigned long long  >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     75        inline bool getValue(float*                value) const override { return convertValue<T, float               >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     76        inline bool getValue(double*               value) const override { return convertValue<T, double              >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     77        inline bool getValue(long double*          value) const override { return convertValue<T, long double         >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     78        inline bool getValue(bool*                 value) const override { return convertValue<T, bool                >(value, value_, 0); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     79        inline bool getValue(void**                value) const override { return convertValue<T, void*               >(value, value_, nullptr); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     80        inline bool getValue(std::string*          value) const override { return convertValue<T, std::string         >(value, value_, NilValue<std::string>         ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     81        inline bool getValue(orxonox::Vector2*     value) const override { return convertValue<T, orxonox::Vector2    >(value, value_, NilValue<orxonox::Vector2>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     82        inline bool getValue(orxonox::Vector3*     value) const override { return convertValue<T, orxonox::Vector3    >(value, value_, NilValue<orxonox::Vector3>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     83        inline bool getValue(orxonox::Vector4*     value) const override { return convertValue<T, orxonox::Vector4    >(value, value_, NilValue<orxonox::Vector4>    ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     84        inline bool getValue(orxonox::ColourValue* value) const override { return convertValue<T, orxonox::ColourValue>(value, value_, NilValue<orxonox::ColourValue>()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     85        inline bool getValue(orxonox::Quaternion*  value) const override { return convertValue<T, orxonox::Quaternion >(value, value_, NilValue<orxonox::Quaternion> ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     86        inline bool getValue(orxonox::Radian*      value) const override { return convertValue<T, orxonox::Radian     >(value, value_, NilValue<orxonox::Radian>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
     87        inline bool getValue(orxonox::Degree*      value) const override { return convertValue<T, orxonox::Degree     >(value, value_, NilValue<orxonox::Degree>     ()); } ///< Assigns the value to the given pointer. The value gets converted if the types don't match.
    8888
    8989        /**
    … …  
    9191            @param other The other MultiType
    9292        */
    93         inline bool setValue(const MultiType& other)
     93        inline bool setValue(const MultiType& other) override
    9494        {
    9595            if (other.value_)
    … …  
    104104        }
    105105
    106         inline bool setValue(const char& value)                 { return (bLastConversionSuccessful = convertValue<char                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    107         inline bool setValue(const unsigned char& value)        { return (bLastConversionSuccessful = convertValue<unsigned char       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    108         inline bool setValue(const short& value)                { return (bLastConversionSuccessful = convertValue<short               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    109         inline bool setValue(const unsigned short& value)       { return (bLastConversionSuccessful = convertValue<unsigned short      , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    110         inline bool setValue(const int& value)                  { return (bLastConversionSuccessful = convertValue<int                 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    111         inline bool setValue(const unsigned int& value)         { return (bLastConversionSuccessful = convertValue<unsigned int        , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    112         inline bool setValue(const long& value)                 { return (bLastConversionSuccessful = convertValue<long                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    113         inline bool setValue(const unsigned long& value)        { return (bLastConversionSuccessful = convertValue<unsigned long       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    114         inline bool setValue(const long long& value)            { return (bLastConversionSuccessful = convertValue<long long           , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    115         inline bool setValue(const unsigned long long& value)   { return (bLastConversionSuccessful = convertValue<unsigned long long  , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    116         inline bool setValue(const float& value)                { return (bLastConversionSuccessful = convertValue<float               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    117         inline bool setValue(const double& value)               { return (bLastConversionSuccessful = convertValue<double              , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    118         inline bool setValue(const long double& value)          { return (bLastConversionSuccessful = convertValue<long double         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    119         inline bool setValue(const bool& value)                 { return (bLastConversionSuccessful = convertValue<bool                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    120         inline bool setValue(      void* const& value)          { return (bLastConversionSuccessful = convertValue<void*               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    121         inline bool setValue(const std::string& value)          { return (bLastConversionSuccessful = convertValue<std::string         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    122         inline bool setValue(const orxonox::Vector2& value)     { return (bLastConversionSuccessful = convertValue<orxonox::Vector2    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    123         inline bool setValue(const orxonox::Vector3& value)     { return (bLastConversionSuccessful = convertValue<orxonox::Vector3    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    124         inline bool setValue(const orxonox::Vector4& value)     { return (bLastConversionSuccessful = convertValue<orxonox::Vector4    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    125         inline bool setValue(const orxonox::ColourValue& value) { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    126         inline bool setValue(const orxonox::Quaternion& value) { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    127         inline bool setValue(const orxonox::Radian& value)      { return (bLastConversionSuccessful = convertValue<orxonox::Radian     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    128         inline bool setValue(const orxonox::Degree& value)      { return (bLastConversionSuccessful = convertValue<orxonox::Degree     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     106        inline bool setValue(const char& value) override                 { return (bLastConversionSuccessful = convertValue<char                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     107        inline bool setValue(const unsigned char& value) override        { return (bLastConversionSuccessful = convertValue<unsigned char       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     108        inline bool setValue(const short& value) override                { return (bLastConversionSuccessful = convertValue<short               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     109        inline bool setValue(const unsigned short& value) override       { return (bLastConversionSuccessful = convertValue<unsigned short      , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     110        inline bool setValue(const int& value) override                  { return (bLastConversionSuccessful = convertValue<int                 , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     111        inline bool setValue(const unsigned int& value) override         { return (bLastConversionSuccessful = convertValue<unsigned int        , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     112        inline bool setValue(const long& value) override                 { return (bLastConversionSuccessful = convertValue<long                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     113        inline bool setValue(const unsigned long& value) override        { return (bLastConversionSuccessful = convertValue<unsigned long       , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     114        inline bool setValue(const long long& value) override            { return (bLastConversionSuccessful = convertValue<long long           , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     115        inline bool setValue(const unsigned long long& value) override   { return (bLastConversionSuccessful = convertValue<unsigned long long  , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     116        inline bool setValue(const float& value) override                { return (bLastConversionSuccessful = convertValue<float               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     117        inline bool setValue(const double& value) override               { return (bLastConversionSuccessful = convertValue<double              , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     118        inline bool setValue(const long double& value) override          { return (bLastConversionSuccessful = convertValue<long double         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     119        inline bool setValue(const bool& value) override                 { return (bLastConversionSuccessful = convertValue<bool                , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     120        inline bool setValue(      void* const& value) override          { return (bLastConversionSuccessful = convertValue<void*               , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     121        inline bool setValue(const std::string& value) override          { return (bLastConversionSuccessful = convertValue<std::string         , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     122        inline bool setValue(const orxonox::Vector2& value) override     { return (bLastConversionSuccessful = convertValue<orxonox::Vector2    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     123        inline bool setValue(const orxonox::Vector3& value) override     { return (bLastConversionSuccessful = convertValue<orxonox::Vector3    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     124        inline bool setValue(const orxonox::Vector4& value) override     { return (bLastConversionSuccessful = convertValue<orxonox::Vector4    , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     125        inline bool setValue(const orxonox::ColourValue& value) override { return (bLastConversionSuccessful = convertValue<orxonox::ColourValue, T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     126        inline bool setValue(const orxonox::Quaternion& value) override { return (bLastConversionSuccessful = convertValue<orxonox::Quaternion , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     127        inline bool setValue(const orxonox::Radian& value) override      { return (bLastConversionSuccessful = convertValue<orxonox::Radian     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
     128        inline bool setValue(const orxonox::Degree& value) override      { return (bLastConversionSuccessful = convertValue<orxonox::Degree     , T>(&value_, value, NilValue<T>())); } ///< Assigns the value by converting it to T.
    129129
    130130        /// Puts the current value on the stream
    131         inline void toString(std::ostream& outstream) const { outstream << this->value_; }
     131        inline void toString(std::ostream& outstream) const override { outstream << this->value_; }
    132132
    133133        /// loads data from the bytestream (mem) into the MT and increases the bytestream pointer by the size of the data
    134         inline void importData( uint8_t*& mem )         { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
     134        inline void importData( uint8_t*& mem ) override         { loadAndIncrease( /*(const T&)*/this->value_, mem ); }
    135135        /// saves data from the MT into the bytestream (mem) and increases the bytestream pointer by the size of the data
    136         inline void exportData( uint8_t*& mem ) const   { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
     136        inline void exportData( uint8_t*& mem ) const override   { saveAndIncrease( /*(const T&)*/this->value_, mem ); }
    137137        /// returns the size of the data that would be saved by exportData
    138         inline uint8_t getSize() const { return returnSize( this->value_ ); }
     138        inline uint8_t getSize() const override { return returnSize( this->value_ ); }
    139139
    140140        T value_; ///< The stored value

  • code/branches/cpp11_v2/src/libraries/util/SharedPtr.h

    r10770 r10817  
    176176                SharedCounterImpl(T* pointer) : pointer_(pointer) {}
    177177
    178                 void destroy()
     178                void destroy() override
    179179                {
    180180                    delete this->pointer_;

  • code/branches/cpp11_v2/src/libraries/util/output/BaseWriter.h

    r8858 r10817  
    103103
    104104        protected:
    105             virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines);
     105            virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override;
    106106
    107107        private:

  • code/branches/cpp11_v2/src/libraries/util/output/ConsoleWriter.h

    r9550 r10817  
    6363
    6464        protected:
    65             virtual void printLine(const std::string& line, OutputLevel level);
     65            virtual void printLine(const std::string& line, OutputLevel level) override;
    6666
    6767        private:

  • code/branches/cpp11_v2/src/libraries/util/output/LogWriter.h

    r9550 r10817  
    7070
    7171        protected:
    72             virtual void printLine(const std::string& line, OutputLevel level);
     72            virtual void printLine(const std::string& line, OutputLevel level) override;
    7373
    7474        private:

  • code/branches/cpp11_v2/src/libraries/util/output/MemoryWriter.h

    r9550 r10817  
    7575
    7676        protected:
    77             virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines);
     77            virtual void output(OutputLevel level, const OutputContextContainer& context, const std::vector<std::string>& lines) override;
    7878
    7979        private:

  • code/branches/cpp11_v2/src/libraries/util/output/OutputManager.h

    r9550 r10817  
    8181            virtual void unregisterListener(OutputListener* listener);
    8282
    83             virtual void updatedLevelMask(const OutputListener* listener)
     83            virtual void updatedLevelMask(const OutputListener* listener) override
    8484                { this->updateCombinedLevelMask(); }
    85             virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener)
     85            virtual void updatedAdditionalContextsLevelMask(const OutputListener* listener) override
    8686                { this->updateCombinedAdditionalContextsLevelMask(); }
    87             virtual void updatedAdditionalContextsMask(const OutputListener* listener)
     87            virtual void updatedAdditionalContextsMask(const OutputListener* listener) override
    8888                { this->updateCombinedAdditionalContextsMask(); }
    8989

  • code/branches/cpp11_v2/src/libraries/util/output/SubcontextOutputListener.h

    r9550 r10817  
    7373            virtual ~SubcontextOutputListener();
    7474
    75             virtual void setAdditionalContextsMask(OutputContextMask mask);
     75            virtual void setAdditionalContextsMask(OutputContextMask mask) override;
    7676            void setAdditionalSubcontexts(const std::set<const OutputContextContainer*>& subcontexts);
    7777
    78             virtual bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const;
     78            virtual bool acceptsOutput(OutputLevel level, const OutputContextContainer& context) const override;
    7979
    8080            inline const std::set<OutputContextSubID>& getSubcontexts() const

  • code/branches/cpp11_v2/src/modules/designtools/CreateStars.h

    r9667 r10817  
    4343            void createBillboards();
    4444
    45             void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     45            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4646
    4747            void setNumStars(int num) {

  • code/branches/cpp11_v2/src/modules/designtools/SkyboxGenerator.h

    r10769 r10817  
    6565            SkyboxGenerator();
    6666            virtual ~SkyboxGenerator();
    67             void tick(float dt); // This is where the skybox generation happens.
     67            void tick(float dt) override; // This is where the skybox generation happens.
    6868            static void createSkybox(void); // Generate the 6 faces of a skybox.
    6969            void setConfigValues(void); // Sets some config values.

  • code/branches/cpp11_v2/src/modules/docking/Dock.h

    r9939 r10817  
    6565
    6666            // XML interface
    67             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    68             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
     67            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     68            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    6969
    7070            // XML functions

  • code/branches/cpp11_v2/src/modules/docking/DockToShip.h

    r9667 r10817  
    6060            virtual ~DockToShip();
    6161
    62             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     62            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6363            void setTargetId(const std::string& str);
    6464            const std::string& getTargetId() const;
    6565
    66             virtual bool docking(PlayerInfo* player); //!< Called when docking starts
    67             virtual bool release(PlayerInfo* player); //!< Called when player wants undock
     66            virtual bool docking(PlayerInfo* player) override; //!< Called when docking starts
     67            virtual bool release(PlayerInfo* player) override; //!< Called when player wants undock
    6868        private:
    6969            std::string target_;

  • code/branches/cpp11_v2/src/modules/docking/DockingController.h

    r9667 r10817  
    4545            virtual ~DockingController();
    4646
    47             virtual void tick(float dt);
     47            virtual void tick(float dt) override;
    4848
    4949            void takeControl(bool docking);
    … …  
    5353
    5454        protected:
    55             virtual void positionReached();
     55            virtual void positionReached() override;
    5656
    5757        private:

  • code/branches/cpp11_v2/src/modules/docking/DockingTarget.h

    r9667 r10817  
    5858            virtual ~DockingTarget();
    5959
    60             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     60            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6161
    6262    };

  • code/branches/cpp11_v2/src/modules/docking/MoveToDockingTarget.h

    r9667 r10817  
    5959            virtual ~MoveToDockingTarget();
    6060
    61             virtual bool docking(PlayerInfo* player); //!< Called when a player starts docking
    62             virtual bool release(PlayerInfo* player); //!< Called when player wants to undock
     61            virtual bool docking(PlayerInfo* player) override; //!< Called when a player starts docking
     62            virtual bool release(PlayerInfo* player) override; //!< Called when player wants to undock
    6363    };
    6464

  • code/branches/cpp11_v2/src/modules/dodgerace/DodgeRace.h

    r10624 r10817  
    6969            DodgeRace(Context* context);
    7070
    71             virtual void start();
    72             virtual void end();
     71            virtual void start() override;
     72            virtual void end() override;
    7373
    74             virtual void tick(float dt);
     74            virtual void tick(float dt) override;
    7575
    76             virtual void playerPreSpawn(PlayerInfo* player);
     76            virtual void playerPreSpawn(PlayerInfo* player) override;
    7777
    7878            void levelUp();
    … …  
    8585            void setCenterpoint(DodgeRaceCenterPoint* center)
    8686                       { this->center_ = center; }
    87             virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
     87            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
    8888
    8989            // checks if multiplier should be reset.

  • code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceCenterPoint.h

    r10624 r10817  
    5050            DodgeRaceCenterPoint(Context* context); //checks whether the gametype is actually DodgeRace.
    5151
    52             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     52            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5353
    5454        private:

  • code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceHUDinfo.h

    r10234 r10817  
    4444            DodgeRaceHUDinfo(Context* context);
    4545
    46             virtual void tick(float dt);
    47             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    48             virtual void changedOwner();
     46            virtual void tick(float dt) override;
     47            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     48            virtual void changedOwner() override;
    4949
    5050            inline void setShowPoints(bool value)

  • code/branches/cpp11_v2/src/modules/dodgerace/DodgeRaceShip.h

    r10624 r10817  
    5252            DodgeRaceShip(Context* context);
    5353
    54             virtual void tick(float dt);
     54            virtual void tick(float dt) override;
    5555
    5656            // overwrite for 2d movement
    57             virtual void moveFrontBack(const Vector2& value);
    58             virtual void moveRightLeft(const Vector2& value);
     57            virtual void moveFrontBack(const Vector2& value) override;
     58            virtual void moveRightLeft(const Vector2& value) override;
    5959
    6060            // Starts or stops fireing
    61             virtual void boost(bool bBoost);
     61            virtual void boost(bool bBoost) override;
    6262
    6363            //no rotation!
    64             virtual void rotateYaw(const Vector2& value){};
    65             virtual void rotatePitch(const Vector2& value){};
     64            virtual void rotateYaw(const Vector2& value) override{};
     65            virtual void rotatePitch(const Vector2& value) override{};
    6666
    6767            //return to main menu if game has ended.
    68             virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
     68            virtual void rotateRoll(const Vector2& value) override{if (getGame()) if (getGame()->bEndGame) getGame()->end();};
    6969
    7070            virtual void updateLevel();
    … …  
    7474
    7575        protected:
    76             virtual void death();
     76            virtual void death() override;
    7777
    7878        private:

  • code/branches/cpp11_v2/src/modules/gametypes/OldRaceCheckPoint.h

    r9667 r10817  
    4848            virtual ~OldRaceCheckPoint();
    4949
    50             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    51             virtual void tick(float dt);
     50            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     51            virtual void tick(float dt) override;
    5252
    5353            protected:
    54             virtual void triggered(bool bIsTriggered);
     54            virtual void triggered(bool bIsTriggered) override;
    5555            inline void setLast(bool isLast)
    5656                { this->bIsLast_ = isLast; }
    … …  
    6464            inline float getTimeLimit()
    6565                { return this->bTimeLimit_;}
    66             inline const WorldEntity* getWorldEntity() const
     66            inline const WorldEntity* getWorldEntity() const override
    6767                { return this; }
    6868

  • code/branches/cpp11_v2/src/modules/gametypes/OldSpaceRace.h

    r9667 r10817  
    5555            virtual ~OldSpaceRace() {}
    5656
    57             virtual void start();
    58             virtual void end();
     57            virtual void start() override;
     58            virtual void end() override;
    5959
    6060            virtual void newCheckpointReached();
    61             virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command.
     61            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command.
    6262                                                        //<! This is only a temporary solution. Better: create racingBots.
    6363

  • code/branches/cpp11_v2/src/modules/gametypes/RaceCheckPoint.h

    r9971 r10817  
    4848            virtual ~RaceCheckPoint();
    4949
    50             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     50            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5151
    5252            inline void setCheckpointIndex(int checkpointIndex)
    … …  
    9292        protected:
    9393
    94             virtual void fire(bool bIsTriggered, BaseObject* originator);
     94            virtual void fire(bool bIsTriggered, BaseObject* originator) override;
    9595
    96             inline const WorldEntity* getWorldEntity() const
     96            inline const WorldEntity* getWorldEntity() const override
    9797            {
    9898                return this;

  • code/branches/cpp11_v2/src/modules/gametypes/SpaceRace.h

    r9667 r10817  
    5757            virtual ~SpaceRace() {}
    5858
    59             void tick(float dt);
     59            void tick(float dt) override;
    6060
    61             virtual void end();
     61            virtual void end() override;
    6262
    6363            void newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player);
    … …  
    7070                { return this->clock_; }
    7171
    72             bool allowPawnHit(Pawn* victim, Pawn* originator);
    73             bool allowPawnDamage(Pawn* victim, Pawn* originator);
    74             bool allowPawnDeath(Pawn* victim, Pawn* originator);
     72            bool allowPawnHit(Pawn* victim, Pawn* originator) override;
     73            bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
     74            bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
    7575
    7676        private:

  • code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceController.h

    r10262 r10817  
    4242            SpaceRaceController(Context* context);
    4343            virtual ~SpaceRaceController();
    44             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    45             virtual void tick(float dt);
     44            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     45            virtual void tick(float dt) override;
    4646
    4747        private:

  • code/branches/cpp11_v2/src/modules/gametypes/SpaceRaceManager.h

    r9667 r10817  
    5858            virtual ~SpaceRaceManager() ;
    5959
    60             void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     60            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6161
    6262            void addCheckpoint(RaceCheckPoint* checkpoint);
    … …  
    6969            std::vector<RaceCheckPoint*> getAllCheckpoints();
    7070
    71             void tick(float dt);
     71            void tick(float dt) override;
    7272
    7373        protected:

  • code/branches/cpp11_v2/src/modules/invader/Invader.h

    r10733 r10817  
    4949            Invader(Context* context);
    5050
    51             virtual void start();
    52             virtual void end();
    53             virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
     51            virtual void start() override;
     52            virtual void end() override;
     53            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
    5454
    5555            void spawnEnemy();

  • code/branches/cpp11_v2/src/modules/invader/InvaderCenterPoint.h

    r10624 r10817  
    4747            InvaderCenterPoint(Context* context); //checks whether the gametype is actually Invader.
    4848
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050
    5151        private:

  • code/branches/cpp11_v2/src/modules/invader/InvaderEnemy.h

    r10733 r10817  
    4646            InvaderEnemy(Context* context);
    4747
    48             virtual void tick(float dt);
     48            virtual void tick(float dt) override;
    4949            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
    50             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
     50            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
    5151            virtual void setPlayer(InvaderShip* player){this->player = player;}
    5252

  • code/branches/cpp11_v2/src/modules/invader/InvaderEnemyShooter.h

    r10626 r10817  
    4747            InvaderEnemyShooter(Context* context);
    4848
    49             virtual void tick(float dt);
    50             virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
     49            virtual void tick(float dt) override;
     50            virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
    5151        protected:
    5252            void shoot();

  • code/branches/cpp11_v2/src/modules/invader/InvaderHUDinfo.h

    r9957 r10817  
    4040            InvaderHUDinfo(Context* context);
    4141
    42             virtual void tick(float dt);
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    44             virtual void changedOwner();
     42            virtual void tick(float dt) override;
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     44            virtual void changedOwner() override;
    4545
    4646            inline void setShowLives(bool value)

  • code/branches/cpp11_v2/src/modules/invader/InvaderShip.h

    r10733 r10817  
    4747            InvaderShip(Context* context);
    4848
    49             virtual void tick(float dt);
     49            virtual void tick(float dt) override;
    5050
    5151            // overwrite for 2d movement
    52             virtual void moveFrontBack(const Vector2& value);
    53             virtual void moveRightLeft(const Vector2& value);
     52            virtual void moveFrontBack(const Vector2& value) override;
     53            virtual void moveRightLeft(const Vector2& value) override;
    5454
    5555            // Starts or stops fireing
    56             virtual void boost(bool bBoost);
     56            virtual void boost(bool bBoost) override;
    5757
    5858            //no rotation!
    59             virtual void rotateYaw(const Vector2& value){};
    60             virtual void rotatePitch(const Vector2& value){};
     59            virtual void rotateYaw(const Vector2& value) override{};
     60            virtual void rotatePitch(const Vector2& value) override{};
    6161            //return to main menu if game has ended.
    62             virtual void rotateRoll(const Vector2& value);
     62            virtual void rotateRoll(const Vector2& value) override;
    6363
    6464            virtual void updateLevel();
    … …  
    6767
    6868        protected:
    69             virtual void death();
     69            virtual void death() override;
    7070        private:
    7171            Invader* getGame();

  • code/branches/cpp11_v2/src/modules/invader/InvaderWeapon.h

    r10733 r10817  
    4848            virtual ~InvaderWeapon();
    4949        protected:
    50             virtual void shot();
     50            virtual void shot() override;
    5151            WeakPtr<Projectile> projectile;
    5252    };

  • code/branches/cpp11_v2/src/modules/invader/InvaderWeaponEnemy.h

    r10733 r10817  
    4747            InvaderWeaponEnemy(Context* context);
    4848        protected:
    49             virtual void shot();
     49            virtual void shot() override;
    5050    };
    5151}

  • code/branches/cpp11_v2/src/modules/jump/Jump.cc

    r10768 r10817  
    9898                if (screenShiftSinceLastUpdate_ > center_->getSectionLength())
    9999                {
    100                     if (sectionNumber_ > 2 && sectionNumber_%4 == 0 && rand()%2 == 0 && figure_->propellerActive_ == false && figure_->rocketActive_ == false && addAdventure(adventureNumber_) == true)
     100                    if (sectionNumber_ > 2 && sectionNumber_%4 == 0 && rand()%2 == 0 && figure_->propellerActive_ == nullptr && figure_->rocketActive_ == nullptr && addAdventure(adventureNumber_) == true)
    101101                    {
    102102                        screenShiftSinceLastUpdate_ -= 2*center_->getSectionLength();

  • code/branches/cpp11_v2/src/modules/jump/Jump.h

    r10733 r10817  
    4040            Jump(Context* context);
    4141            virtual ~Jump();
    42             virtual void tick(float dt);
    43             virtual void start();
    44             virtual void end();
    45             virtual void spawnPlayer(PlayerInfo* player);
     42            virtual void tick(float dt) override;
     43            virtual void start() override;
     44            virtual void end() override;
     45            virtual void spawnPlayer(PlayerInfo* player) override;
    4646            int getScore(PlayerInfo* player) const;
    4747            float getFuel() const;

  • code/branches/cpp11_v2/src/modules/jump/JumpBoots.h

    r10733 r10817  
    4040            JumpBoots(Context* context);
    4141            virtual ~JumpBoots();
    42             virtual void tick(float dt);
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    44             virtual void touchFigure();
     42            virtual void tick(float dt) override;
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     44            virtual void touchFigure() override;
    4545            virtual float getFuelState();
    4646        protected:

  • code/branches/cpp11_v2/src/modules/jump/JumpCenterpoint.h

    r10733 r10817  
    108108            JumpCenterpoint(Context* context); //!< Constructor. Registers and initializes the object and checks whether the gametype is actually Jump.
    109109            virtual ~JumpCenterpoint() {}
    110             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a JumpCenterpoint through XML.
     110            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a JumpCenterpoint through XML.
    111111            void setPlatformStaticTemplate(const std::string& balltemplate)
    112112                { this->platformStaticTemplate_ = balltemplate; }

  • code/branches/cpp11_v2/src/modules/jump/JumpEnemy.h

    r10733 r10817  
    4646            JumpEnemy(Context* context);
    4747            virtual ~JumpEnemy();
    48             virtual void tick(float dt);
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     48            virtual void tick(float dt) override;
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050            void setFieldDimension(float width, float height)
    5151                { this->fieldWidth_ = width; this->fieldHeight_ = height; }

  • code/branches/cpp11_v2/src/modules/jump/JumpFigure.cc

    r10765 r10817  
    319319    bool JumpFigure::StartShield(JumpShield* shield)
    320320    {
    321         if (shieldActive_ == false)
     321        if (shieldActive_ == nullptr)
    322322        {
    323323            attach(shield);

  • code/branches/cpp11_v2/src/modules/jump/JumpFigure.h

    r10262 r10817  
    4040            JumpFigure(Context* context); //!< Constructor. Registers and initializes the object.
    4141            virtual ~JumpFigure() {}
    42             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    43             virtual void tick(float dt);
    44             virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
    45             virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
    46             virtual void rotateYaw(const Vector2& value);
    47             virtual void rotatePitch(const Vector2& value);
    48             virtual void rotateRoll(const Vector2& value);
     42            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     43            virtual void tick(float dt) override;
     44            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
     45            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
     46            virtual void rotateYaw(const Vector2& value) override;
     47            virtual void rotatePitch(const Vector2& value) override;
     48            virtual void rotateRoll(const Vector2& value) override;
    4949            void fire(unsigned int firemode);
    50             virtual void fired(unsigned int firemode);
     50            virtual void fired(unsigned int firemode) override;
    5151            virtual void JumpFromPlatform(JumpPlatform* platform);
    5252            virtual void JumpFromSpring(JumpSpring* spring);

  • code/branches/cpp11_v2/src/modules/jump/JumpItem.h

    r10733 r10817  
    4747            JumpItem(Context* context);
    4848            virtual ~JumpItem();
    49             virtual void tick(float dt);
    50             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     49            virtual void tick(float dt) override;
     50            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5151            virtual void setProperties(float newLeftBoundary, float newRightBoundary, float newLowerBoundary, float newUpperBoundary, float newHSpeed, float newVSpeed);
    5252            virtual void setFigure(JumpFigure* newFigure);

  • code/branches/cpp11_v2/src/modules/jump/JumpPlatform.h

    r10733 r10817  
    4646            JumpPlatform(Context* context);
    4747            virtual ~JumpPlatform();
    48             virtual void tick(float dt);
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     48            virtual void tick(float dt) override;
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050            void setFigure(JumpFigure* newFigure);
    5151            virtual void touchFigure();

  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformDisappear.h

    r10733 r10817  
    4646            JumpPlatformDisappear(Context* context);
    4747            virtual ~JumpPlatformDisappear();
    48             virtual void tick(float dt);
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     48            virtual void tick(float dt) override;
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050            virtual void setProperties(bool active);
    5151            virtual bool isActive();
    52             virtual void touchFigure();
     52            virtual void touchFigure() override;
    5353
    5454        protected:

  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformFake.h

    r10733 r10817  
    4646            JumpPlatformFake(Context* context);
    4747            virtual ~JumpPlatformFake();
    48             virtual void tick(float dt);
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     48            virtual void tick(float dt) override;
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050    };
    5151}

  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformHMove.h

    r10733 r10817  
    4141            JumpPlatformHMove(Context* context);
    4242            virtual ~JumpPlatformHMove();
    43             virtual void tick(float dt);
    44             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     43            virtual void tick(float dt) override;
     44            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4545            virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
    46             virtual void touchFigure();
     46            virtual void touchFigure() override;
    4747
    4848        protected:

  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformStatic.h

    r10733 r10817  
    4141            virtual ~JumpPlatformStatic();
    4242
    43             virtual void tick(float dt);
    44             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     43            virtual void tick(float dt) override;
     44            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4545
    46             virtual void touchFigure();
     46            virtual void touchFigure() override;
    4747    };
    4848}

  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformTimer.h

    r10733 r10817  
    4646            JumpPlatformTimer(Context* context);
    4747            virtual ~JumpPlatformTimer();
    48             virtual void tick(float dt);
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     48            virtual void tick(float dt) override;
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050            virtual void setProperties(float time);
    5151            virtual bool isActive(void);
    52             virtual void touchFigure();
     52            virtual void touchFigure() override;
    5353
    5454            void setEffectPath(const std::string& effectPath)

  • code/branches/cpp11_v2/src/modules/jump/JumpPlatformVMove.h

    r10733 r10817  
    4040            JumpPlatformVMove(Context* context);
    4141            virtual ~JumpPlatformVMove();
    42             virtual void tick(float dt);
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     42            virtual void tick(float dt) override;
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4444            virtual void setProperties(float leftBoundary, float rightBoundary, float speed);
    45             virtual void touchFigure();
     45            virtual void touchFigure() override;
    4646
    4747        protected:

  • code/branches/cpp11_v2/src/modules/jump/JumpProjectile.h

    r10624 r10817  
    4343            virtual ~JumpProjectile();
    4444
    45             virtual void tick(float dt);
     45            virtual void tick(float dt) override;
    4646
    47             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     47            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4848
    4949            void setFieldDimension(float width, float height)

  • code/branches/cpp11_v2/src/modules/jump/JumpPropeller.h

    r10733 r10817  
    4040            JumpPropeller(Context* context);
    4141            virtual ~JumpPropeller();
    42             virtual void tick(float dt);
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    44             virtual void touchFigure();
     42            virtual void tick(float dt) override;
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     44            virtual void touchFigure() override;
    4545            virtual float getFuelState();
    4646        protected:

  • code/branches/cpp11_v2/src/modules/jump/JumpRocket.h

    r10733 r10817  
    4040            JumpRocket(Context* context);
    4141            virtual ~JumpRocket();
    42             virtual void tick(float dt);
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    44             virtual void touchFigure();
     42            virtual void tick(float dt) override;
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     44            virtual void touchFigure() override;
    4545            virtual float getFuelState();
    4646        protected:

  • code/branches/cpp11_v2/src/modules/jump/JumpScore.h

    r10262 r10817  
    4444            virtual ~JumpScore();
    4545
    46             virtual void tick(float dt);
    47             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    48             virtual void changedOwner();
     46            virtual void tick(float dt) override;
     47            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     48            virtual void changedOwner() override;
    4949
    5050            void setShowScore(const bool showScore)

  • code/branches/cpp11_v2/src/modules/jump/JumpShield.h

    r10733 r10817  
    4040            JumpShield(Context* context);
    4141            virtual ~JumpShield();
    42             virtual void tick(float dt);
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    44             virtual void touchFigure();
     42            virtual void tick(float dt) override;
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     44            virtual void touchFigure() override;
    4545            virtual float getFuelState();
    4646        protected:

  • code/branches/cpp11_v2/src/modules/jump/JumpSpring.h

    r10733 r10817  
    4040            JumpSpring(Context* context);
    4141            virtual ~JumpSpring();
    42             virtual void tick(float dt);
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     42            virtual void tick(float dt) override;
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4444            virtual void accelerateFigure();
    45             virtual void touchFigure();
     45            virtual void touchFigure() override;
    4646        protected:
    4747            float stretch_;

  • code/branches/cpp11_v2/src/modules/mini4dgame/Mini4Dgame.h

    r10230 r10817  
    6565            virtual ~Mini4Dgame(); //!< Destructor. Cleans up, if initialized.
    6666
    67             virtual void start(void); //!< Starts the Mini4Dgame minigame.
    68             virtual void end(void); ///!< Ends the Mini4Dgame minigame.
     67            virtual void start(void) override; //!< Starts the Mini4Dgame minigame.
     68            virtual void end(void) override; ///!< Ends the Mini4Dgame minigame.
    6969
    70             virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
     70            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
    7171
    7272            void setGameboard(Mini4DgameBoard* board)
    … …  
    8484
    8585        protected:
    86             virtual void spawnPlayersIfRequested(); //!< Spawns player.
     86            virtual void spawnPlayersIfRequested() override; //!< Spawns player.
    8787
    8888

  • code/branches/cpp11_v2/src/modules/mini4dgame/Mini4DgameBoard.h

    r10624 r10817  
    7474            //virtual ~Mini4DgameBoard();
    7575
    76             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     76            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    7777
    7878            bool isValidMove(const Mini4DgamePosition& move);

  • code/branches/cpp11_v2/src/modules/notifications/NotificationDispatcher.h

    r9667 r10817  
    7979            virtual ~NotificationDispatcher(); //!< Destructor.
    8080
    81             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a NotificationDispatcher object through XML.
    82             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
     81            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a NotificationDispatcher object through XML.
     82            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    8383
    8484            /**

  • code/branches/cpp11_v2/src/modules/notifications/NotificationManager.h

    r9667 r10817  
    120120            virtual ~NotificationManager();
    121121
    122             virtual void preDestroy(void); // Is called before the object is destroyed.
     122            virtual void preDestroy(void) override; // Is called before the object is destroyed.
    123123
    124124            /**
    … …  
    128128            static NotificationManager& getInstance() { return Singleton<NotificationManager>::getInstance(); } // tolua_export
    129129
    130             virtual bool registerNotification(const std::string& message, const std::string& sender, notificationMessageType::Value type);
    131             virtual bool executeCommand(notificationCommand::Value command, const std::string& sender);
     130            virtual bool registerNotification(const std::string& message, const std::string& sender, notificationMessageType::Value type) override;
     131            virtual bool executeCommand(notificationCommand::Value command, const std::string& sender) override;
    132132
    133133            bool registerNotification(Notification* notification); // Registers a Notification within the NotificationManager.

  • code/branches/cpp11_v2/src/modules/notifications/NotificationQueue.h

    r9667 r10817  
    9797            virtual ~NotificationQueue();
    9898
    99             virtual void tick(float dt); // To update from time to time.
    100             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    101 
    102             virtual void changedName(void);
     99            virtual void tick(float dt) override; // To update from time to time.
     100            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     101
     102            virtual void changedName(void) override;
    103103           
    104104            void update(void); // Updates the NotificationQueue.

  • code/branches/cpp11_v2/src/modules/notifications/NotificationQueueCEGUI.h

    r9667 r10817  
    7373            virtual ~NotificationQueueCEGUI();
    7474
    75             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     75            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    7676
    77             virtual void changedName(void);
     77            virtual void changedName(void) override;
    7878
    7979            void destroy(bool noGraphics = false); // Destroys the NotificationQueue.
    … …  
    136136            void registerVariables();
    137137           
    138             virtual void create(void); // Creates the NotificationQueue in lua.
     138            virtual void create(void) override; // Creates the NotificationQueue in lua.
    139139           
    140             virtual void notificationPushed(Notification* notification); // Is called by the NotificationQueue when a Notification was pushed
    141             virtual void notificationPopped(void); // Is called by the NotificationQueue when a Notification was popped.
    142             virtual void notificationRemoved(unsigned int index); // Is called when a Notification was removed.
     140            virtual void notificationPushed(Notification* notification) override; // Is called by the NotificationQueue when a Notification was pushed
     141            virtual void notificationPopped(void) override; // Is called by the NotificationQueue when a Notification was popped.
     142            virtual void notificationRemoved(unsigned int index) override; // Is called when a Notification was removed.
    143143           
    144             virtual void clear(bool noGraphics = false); // Clears the NotificationQueue by removing all NotificationContainers.
     144            virtual void clear(bool noGraphics = false) override; // Clears the NotificationQueue by removing all NotificationContainers.
    145145
    146146        protected:

  • code/branches/cpp11_v2/src/modules/objects/Attacher.h

    r9667 r10817  
    5151            virtual ~Attacher() {}
    5252
    53             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     53            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5454
    55             virtual void processEvent(Event& event);
    56             virtual void changedActivity();
    57             virtual void changedVisibility();
     55            virtual void processEvent(Event& event) override;
     56            virtual void changedActivity() override;
     57            virtual void changedVisibility() override;
    5858
    5959            void addObject(WorldEntity* object);
    … …  
    6464                { return this->targetname_; }
    6565
    66             void loadedNewXMLName(BaseObject* object);
     66            void loadedNewXMLName(BaseObject* object) override;
    6767
    6868        private:

  • code/branches/cpp11_v2/src/modules/objects/ForceField.h

    r10622 r10817  
    9292            virtual ~ForceField();
    9393
    94             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a ForceField object through XML.
     94            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a ForceField object through XML.
    9595            void registerVariables(); //!< Registers the variables that should get synchronised over the network
    96             virtual void tick(float dt); //!< A method that is called every tick.
     96            virtual void tick(float dt) override; //!< A method that is called every tick.
    9797           
    9898

  • code/branches/cpp11_v2/src/modules/objects/Planet.h

    r10624 r10817  
    5252            virtual ~Planet();
    5353
    54             virtual void tick(float dt);
     54            virtual void tick(float dt) override;
    5555
    56             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     56            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5757
    58             virtual void changedVisibility();
     58            virtual void changedVisibility() override;
    5959
    6060            inline void setMeshSource(const std::string& meshname)

  • code/branches/cpp11_v2/src/modules/objects/Script.h

    r9667 r10817  
    9898            virtual ~Script();
    9999
    100             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Script object through XML.
    101             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a port that can be used to channel events and react to them.
     100            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Script object through XML.
     101            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a port that can be used to channel events and react to them.
    102102
    103103            bool trigger(bool triggered, BaseObject* trigger); //!< Is called when an event comes in trough the event port.
    … …  
    168168                { return this->forAll_; }
    169169
    170             virtual void clientConnected(unsigned int clientId); //!< Callback that is called when a new client has connected.
    171             virtual void clientDisconnected(unsigned int clientid) {}
     170            virtual void clientConnected(unsigned int clientId) override; //!< Callback that is called when a new client has connected.
     171            virtual void clientDisconnected(unsigned int clientid) override {}
    172172
    173173        private:

  • code/branches/cpp11_v2/src/modules/objects/SpaceBoundaries.h

    r10769 r10817  
    9393            int getReaction();
    9494
    95             void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     95            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    9696
    97             void tick(float dt);
     97            void tick(float dt) override;
    9898
    9999        private:

  • code/branches/cpp11_v2/src/modules/objects/Turret.h

    r10622 r10817  
    6161            virtual ~Turret();
    6262
    63             virtual void rotatePitch(const Vector2& value);
    64             virtual void rotateYaw(const Vector2& value);
    65             virtual void rotateRoll(const Vector2& value);
     63            virtual void rotatePitch(const Vector2& value) override;
     64            virtual void rotateYaw(const Vector2& value) override;
     65            virtual void rotateRoll(const Vector2& value) override;
    6666            virtual float isInRange(const WorldEntity* target);
    6767            virtual void aimAtPosition(const Vector3 &position);
    6868
    69             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    70             virtual void tick(float dt);
     69            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     70            virtual void tick(float dt) override;
    7171
    7272            /** @brief Sets the maximum distance the turret is allowed to shoot. @param radius The distance*/

  • code/branches/cpp11_v2/src/modules/overlays/FadeoutText.h

    r9667 r10817  
    4444            virtual ~FadeoutText() {}
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    47             virtual void tick(float dt);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     47            virtual void tick(float dt) override;
    4848
    4949            inline void setDelay(float delay)
    … …  
    5858
    5959        private:
    60             virtual void changedColour();
    61             virtual void changedCaption();
     60            virtual void changedColour() override;
     61            virtual void changedCaption() override;
    6262
    6363            void fadeout();

  • code/branches/cpp11_v2/src/modules/overlays/GUIOverlay.h

    r9667 r10817  
    4444            virtual ~GUIOverlay();
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    4848            void setGUIName(const std::string& name);
    4949            inline const std::string& getGUIName() const { return this->guiName_; }
    5050
    51             virtual void changedVisibility();
    52             virtual void changedOwner();
     51            virtual void changedVisibility() override;
     52            virtual void changedOwner() override;
    5353
    5454        private:

  • code/branches/cpp11_v2/src/modules/overlays/OverlayText.h

    r9667 r10817  
    5252        virtual ~OverlayText();
    5353
    54         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     54        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5555
    5656        void setCaption(const std::string& caption);
    … …  
    7676
    7777    protected:
    78         virtual void sizeChanged();
     78        virtual void sizeChanged() override;
    7979        virtual void changedColour() {}
    8080        virtual void changedCaption() {}

  • code/branches/cpp11_v2/src/modules/overlays/debugging/DebugFPSText.h

    r9667 r10817  
    4343        virtual ~DebugFPSText();
    4444
    45         virtual void tick(float dt);
     45        virtual void tick(float dt) override;
    4646    };
    4747}

  • code/branches/cpp11_v2/src/modules/overlays/debugging/DebugPositionText.h

    r9943 r10817  
    4343        virtual ~DebugPositionText();
    4444
    45         virtual void tick(float dt);
     45        virtual void tick(float dt) override;
    4646    };
    4747}

  • code/branches/cpp11_v2/src/modules/overlays/debugging/DebugRTRText.h

    r9667 r10817  
    4343        virtual ~DebugRTRText();
    4444
    45         virtual void tick(float dt);
     45        virtual void tick(float dt) override;
    4646    };
    4747}

  • code/branches/cpp11_v2/src/modules/overlays/hud/AnnounceMessage.h

    r9667 r10817  
    4343            virtual ~AnnounceMessage() {}
    4444
    45             virtual void changedOwner();
     45            virtual void changedOwner() override;
    4646
    47             void announcemessage(const GametypeInfo* gtinfo, const std::string& message);
     47            void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/ChatOverlay.h

    r9667 r10817  
    4949
    5050        protected:
    51             virtual void incomingChat(const std::string& message, const std::string& name);
     51            virtual void incomingChat(const std::string& message, const std::string& name) override;
    5252
    5353            std::list<Ogre::DisplayString> messages_;

  • code/branches/cpp11_v2/src/modules/overlays/hud/CountDown.h

    r9943 r10817  
    4444            virtual ~CountDown();
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    47             virtual void changedOwner();
    48             virtual void tick(float dt);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     47            virtual void changedOwner() override;
     48            virtual void tick(float dt) override;
    4949
    5050            inline void setCounter(float value)

  • code/branches/cpp11_v2/src/modules/overlays/hud/DeathMessage.h

    r9667 r10817  
    4343            virtual ~DeathMessage() {}
    4444
    45             virtual void changedOwner();
     45            virtual void changedOwner() override;
    4646
    47             void deathmessage(const GametypeInfo* gtinfo, const std::string& message);
     47            void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/GametypeFadingMessage.h

    r9667 r10817  
    4343            virtual ~GametypeFadingMessage();
    4444
    45             virtual void changedOwner();
     45            virtual void changedOwner() override;
    4646
    47             void fadingmessage(const GametypeInfo* gtinfo, const std::string& message);
     47            void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/GametypeStaticMessage.h

    r9667 r10817  
    4646            virtual ~GametypeStaticMessage();
    4747
    48             virtual void changedOwner();
     48            virtual void changedOwner() override;
    4949
    50             void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour);
     50            void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
    5151
    5252        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDBar.h

    r9667 r10817  
    5151        virtual ~BarColour() { }
    5252
    53         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     53        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5454
    5555        void setColour(const ColourValue& colour) { this->colour_ = colour; }
    … …  
    7171        virtual ~HUDBar();
    7272
    73         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     73        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    7474
    7575        void clearColours();

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDBoostBar.h

    r9667 r10817  
    4343        virtual ~HUDBoostBar();
    4444
    45         virtual void tick(float dt);
    46         virtual void changedOwner();
     45        virtual void tick(float dt) override;
     46        virtual void changedOwner() override;
    4747
    4848    private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.cc

    r10768 r10817  
    3030
    3131#include "core/config/ConfigValueIncludes.h"
     32#include "core/CoreIncludes.h"
    3233#include "worldentities/pawns/Pawn.h"
    3334

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDEnemyHealthBar.h

    r9667 r10817  
    4141
    4242            void setConfigValues();
    43             virtual void tick(float dt);
     43            virtual void tick(float dt) override;
    4444
    45             void changedOwner();
     45            void changedOwner() override;
    4646
    4747        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDHealthBar.h

    r10624 r10817  
    4545            virtual ~HUDHealthBar();
    4646
    47             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    48             virtual void tick(float dt);
    49             virtual void changedOwner();
    50             virtual void changedOverlayGroup();
    51             virtual void changedVisibility();
    52             virtual void changedName();
     47            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     48            virtual void tick(float dt) override;
     49            virtual void changedOwner() override;
     50            virtual void changedOverlayGroup() override;
     51            virtual void changedVisibility() override;
     52            virtual void changedName() override;
    5353
    5454            inline void setTextFont(const std::string& font)

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDNavigation.h

    r10769 r10817  
    5151            void setConfigValues();
    5252
    53             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    54             virtual void tick(float dt);
     53            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     54            virtual void tick(float dt) override;
    5555
    5656            // RadarListener interface
    57             virtual void addObject(RadarViewable* object);
    58             virtual void removeObject(RadarViewable* viewable);
    59             virtual void objectChanged(RadarViewable* viewable);
     57            virtual void addObject(RadarViewable* object) override;
     58            virtual void removeObject(RadarViewable* viewable) override;
     59            virtual void objectChanged(RadarViewable* viewable) override;
    6060
    61             virtual void changedOwner();
    62             virtual void sizeChanged();
    63             virtual void angleChanged() { }
    64             virtual void positionChanged() { }
    65             virtual void radarTick(float dt) {}
     61            virtual void changedOwner() override;
     62            virtual void sizeChanged() override;
     63            virtual void angleChanged() override { }
     64            virtual void positionChanged() override { }
     65            virtual void radarTick(float dt) override {}
    6666
    67             inline float getRadarSensitivity() const
     67            inline float getRadarSensitivity() const override
    6868                { return 1.0f; }
    6969

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDRadar.h

    r9945 r10817  
    5050        virtual ~HUDRadar();
    5151
    52         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    53         virtual void changedOwner();
     52        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     53        virtual void changedOwner() override;
    5454        void setConfigValues();
    5555
    … …  
    8080        void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; }
    8181
    82         float getRadarSensitivity() const { return this->sensitivity_; }
     82        float getRadarSensitivity() const override { return this->sensitivity_; }
    8383        // used also by RadarListener interface!
    8484        void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
    … …  
    8989
    9090        // RadarListener interface
    91         virtual void addObject(RadarViewable* viewable);
    92         virtual void removeObject(RadarViewable* viewable);
    93         virtual void objectChanged( RadarViewable* rv );
    94         void radarTick(float dt);
     91        virtual void addObject(RadarViewable* viewable) override;
     92        virtual void removeObject(RadarViewable* viewable) override;
     93        virtual void objectChanged( RadarViewable* rv ) override;
     94        void radarTick(float dt) override;
    9595        bool showObject( RadarViewable* rv ); //!< Do not display an object on radar, if showObject(.) is false.
    9696

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDSpeedBar.h

    r9667 r10817  
    4444        virtual ~HUDSpeedBar();
    4545
    46         virtual void tick(float dt);
    47         virtual void changedOwner();
     46        virtual void tick(float dt) override;
     47        virtual void changedOwner() override;
    4848
    4949    private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/HUDTimer.h

    r9667 r10817  
    4343        virtual ~HUDTimer();
    4444
    45         virtual void tick(float dt);
     45        virtual void tick(float dt) override;
    4646
    47         virtual void changedOwner();
     47        virtual void changedOwner() override;
    4848
    4949    private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/KillMessage.h

    r9667 r10817  
    4343            virtual ~KillMessage() {}
    4444
    45             virtual void changedOwner();
     45            virtual void changedOwner() override;
    4646
    47             void killmessage(const GametypeInfo* gtinfo, const std::string& message);
     47            void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/LastManStandingInfos.h

    r9667 r10817  
    4343            virtual ~LastManStandingInfos();
    4444
    45             virtual void tick(float dt);
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    47             virtual void changedOwner();
     45            virtual void tick(float dt) override;
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     47            virtual void changedOwner() override;
    4848
    4949            inline void setShowLives(bool value)

  • code/branches/cpp11_v2/src/modules/overlays/hud/LastTeamStandingInfos.h

    r9667 r10817  
    4343            virtual ~LastTeamStandingInfos();
    4444
    45             virtual void tick(float dt);
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    47             virtual void changedOwner();
     45            virtual void tick(float dt) override;
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     47            virtual void changedOwner() override;
    4848
    4949            inline void setShowLives(bool value)

  • code/branches/cpp11_v2/src/modules/overlays/hud/PauseNotice.h

    r9667 r10817  
    4242            PauseNotice(Context* context);
    4343
    44             virtual void changedOwner();
     44            virtual void changedOwner() override;
    4545
    4646        protected:
    47             virtual void changedTimeFactor(float factor_new, float factor_old);
     47            virtual void changedTimeFactor(float factor_new, float factor_old) override;
    4848
    4949        private:

  • code/branches/cpp11_v2/src/modules/overlays/hud/TeamBaseMatchScore.h

    r9667 r10817  
    4343            virtual ~TeamBaseMatchScore();
    4444
    45             virtual void tick(float dt);
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    47             virtual void changedOwner();
     45            virtual void tick(float dt) override;
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     47            virtual void changedOwner() override;
    4848
    4949            inline void setShowBases(bool value)

  • code/branches/cpp11_v2/src/modules/overlays/stats/Scoreboard.h

    r9667 r10817  
    4444        virtual ~Scoreboard();
    4545
    46         virtual void tick(float dt);
     46        virtual void tick(float dt) override;
    4747
    4848        inline void setCreateLines(CreateLines* cl)
    … …  
    5151            { return this->createlines_; }
    5252
    53         virtual void changedVisibility();
     53        virtual void changedVisibility() override;
    5454
    5555    private: // functions

  • code/branches/cpp11_v2/src/modules/overlays/stats/Stats.h

    r9667 r10817  
    4646        void setConfigValues();
    4747
    48         virtual void tick(float dt);
     48        virtual void tick(float dt) override;
    4949
    5050    private: // variables

  • code/branches/cpp11_v2/src/modules/pickup/CollectiblePickup.h

    r10765 r10817  
    6161            virtual ~CollectiblePickup(); //! Destructor.
    6262
    63             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
    64             virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
     63            virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
     64            virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
    6565
    6666            /**

  • code/branches/cpp11_v2/src/modules/pickup/Pickup.h

    r9667 r10817  
    103103            virtual ~Pickup(); //!< Destructor.
    104104
    105             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     105            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    106106
    107             virtual const std::string& getRepresentationName() const
     107            virtual const std::string& getRepresentationName() const override
    108108                { return this->representationName_; }
    109109
    … …  
    149149                { return this->getDurationType() == pickupDurationType::continuous; }
    150150
    151             virtual void changedPickedUp(void); //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
     151            virtual void changedPickedUp(void) override; //!< Should be called when the pickup has transited from picked up to dropped or the other way around.
    152152
    153153        protected:
    154             virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
     154            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
    155155
    156156            /**

  • code/branches/cpp11_v2/src/modules/pickup/PickupCollection.h

    r9667 r10817  
    7373            virtual ~PickupCollection(); //!< Destructor.
    7474
    75             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates an instance of this Class through XML.
     75            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates an instance of this Class through XML.
    7676
    77             virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
    78             virtual void changedCarrier(void); //!< Is called when the pickup has changed its PickupCarrier.
    79             virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
     77            virtual void changedUsed(void) override; //!< Is called when the pickup has transited from used to unused or the other way around.
     78            virtual void changedCarrier(void) override; //!< Is called when the pickup has changed its PickupCarrier.
     79            virtual void changedPickedUp(void) override; //!< Is called when the pickup has transited from picked up to dropped or the other way around.
    8080
    81             virtual bool isTarget(const PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
     81            virtual bool isTarget(const PickupCarrier* carrier) const override; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
    8282
    8383            inline void setRepresentationName(const std::string& name)
    8484                { this->representationName_ = name; }
    85             virtual const std::string& getRepresentationName() const
     85            virtual const std::string& getRepresentationName() const override
    8686                { return this->representationName_; }
    8787
    … …  
    9898
    9999        protected:
    100             virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
     100            virtual bool createSpawner(void) override; //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
    101101
    102102        private:

  • code/branches/cpp11_v2/src/modules/pickup/PickupManager.h

    r10769 r10817  
    117117            PickupRepresentation* getRepresentation(const std::string& name); // tolua_export
    118118
    119             virtual void pickupChangedUsed(Pickupable* pickup, bool used); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
     119            virtual void pickupChangedUsed(Pickupable* pickup, bool used) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input used state.
    120120            static void pickupChangedUsedNetwork(uint32_t pickup, bool inUse, bool usable, bool unusable); //!< Helper method to react to the change in the used status of a Pickupable.
    121             virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp); //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
     121            virtual void pickupChangedPickedUp(Pickupable* pickup, bool pickedUp) override; //!< Is called by the PickupListener to notify the PickupManager, that the input Pickupable has transited to the input pickedUp state.
    122122            static void pickupChangedPickedUpNetwork(uint32_t pickup, bool usable, uint32_t representationObjectId, const std::string& representationName, bool pickedUp); //!< Helper method to react to the change in the pickedUp status of a Pickupable.
    123123

  • code/branches/cpp11_v2/src/modules/pickup/PickupRepresentation.h

    r10765 r10817  
    9898            virtual ~PickupRepresentation(); //!< Destructor.
    9999
    100             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PickupRepresentation object through XML.
     100            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a PickupRepresentation object through XML.
    101101
    102102            /**
    … …  
    129129            inline const std::string& getInventoryRepresentation(void) const { return this->inventoryRepresentation_; } // tolua_export
    130130
    131             virtual void changedName();
     131            virtual void changedName() override;
    132132
    133133            StaticEntity* createSpawnerRepresentation(PickupSpawner* spawner); //!< Create a spawnerRepresentation for a specific PickupSpawner.

  • code/branches/cpp11_v2/src/modules/pickup/PickupSpawner.h

    r9667 r10817  
    8282            static PickupSpawner* createDroppedPickup(Context* context, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance = 10.0);
    8383
    84             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< Method for creating a PickupSpawner through XML.
    85             virtual void tick(float dt); //!< Tick, checks if any Pawn is close enough to trigger.
     84            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;  //!< Method for creating a PickupSpawner through XML.
     85            virtual void tick(float dt) override; //!< Tick, checks if any Pawn is close enough to trigger.
    8686
    8787            /**

  • code/branches/cpp11_v2/src/modules/pong/Pong.h

    r9667 r10817  
    6868            virtual ~Pong(); //!< Destructor. Cleans up, if initialized.
    6969
    70             virtual void start(); //!< Starts the Pong minigame.
    71             virtual void end(); ///!< Ends the Pong minigame.
     70            virtual void start() override; //!< Starts the Pong minigame.
     71            virtual void end() override; ///!< Ends the Pong minigame.
    7272
    73             virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
     73            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
    7474
    75             virtual void playerScored(PlayerInfo* player, int score = 1); //!< Is called when the player scored.
     75            virtual void playerScored(PlayerInfo* player, int score = 1) override; //!< Is called when the player scored.
    7676
    7777            /**
    … …  
    8787
    8888        protected:
    89             virtual void spawnPlayersIfRequested(); //!< Spawns players, and fills the rest up with bots.
     89            virtual void spawnPlayersIfRequested() override; //!< Spawns players, and fills the rest up with bots.
    9090
    9191            void startBall(); //!< Starts the ball with some default speed.

  • code/branches/cpp11_v2/src/modules/pong/PongAI.h

    r10769 r10817  
    6666            void setConfigValues();
    6767
    68             virtual void tick(float dt); //!< Implements the behavior of the PongAI (i.e. its intelligence).
     68            virtual void tick(float dt) override; //!< Implements the behavior of the PongAI (i.e. its intelligence).
    6969
    7070            /**

  • code/branches/cpp11_v2/src/modules/pong/PongBall.h

    r9939 r10817  
    6363            virtual ~PongBall();
    6464
    65             virtual void tick(float dt);
     65            virtual void tick(float dt) override;
    6666
    67             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     67            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6868
    6969            /**

  • code/branches/cpp11_v2/src/modules/pong/PongBat.h

    r9667 r10817  
    6060            virtual ~PongBat() {}
    6161
    62             virtual void tick(float dt);
     62            virtual void tick(float dt) override;
    6363
    64             virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
    65             virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
     64            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
     65            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
    6666
    67             virtual void changedPlayer(); //!< Is called when the player changed.
     67            virtual void changedPlayer() override; //!< Is called when the player changed.
    6868
    6969            /**

  • code/branches/cpp11_v2/src/modules/pong/PongCenterpoint.h

    r10624 r10817  
    124124            virtual ~PongCenterpoint() {}
    125125
    126             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a PongCenterpoint through XML.
     126            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a PongCenterpoint through XML.
    127127
    128128            /**

  • code/branches/cpp11_v2/src/modules/pong/PongScore.h

    r9939 r10817  
    6060            virtual ~PongScore();
    6161
    62             virtual void tick(float dt); //!< Creates and sets the caption to be displayed by the PongScore.
    63             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    64             virtual void changedOwner(); //!< Is called when the owner changes.
     62            virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the PongScore.
     63            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     64            virtual void changedOwner() override; //!< Is called when the owner changes.
    6565
    6666            /**

  • code/branches/cpp11_v2/src/modules/portals/PortalEndPoint.h

    r9667 r10817  
    6363            virtual ~PortalEndPoint();
    6464
    65             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    66             virtual void changedActivity(void);
     65            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     66            virtual void changedActivity(void) override;
    6767
    6868            inline void setTarget(const std::string & target)                 //!< add types which are allowed to activate the PortalEndPoint
    6969                { this->trigger_->addTarget(target); }
    7070
    71             void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
     71            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    7272            static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< Maps the id of each PortalEndPoint to a pointer to that PortalEndPoint
    7373            inline void setReenterDelay(unsigned int seconds)

  • code/branches/cpp11_v2/src/modules/portals/PortalLink.h

    r9667 r10817  
    5656            PortalLink(Context* context);
    5757            virtual ~PortalLink();
    58             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     58            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5959
    6060            inline void setFromID(unsigned int from)    //!< set the ID of the PortalEndPoint which should act as the entrance of this link

  • code/branches/cpp11_v2/src/modules/questsystem/GlobalQuest.h

    r9667 r10817  
    9393            virtual ~GlobalQuest();
    9494
    95             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a GlobalQuest object through XML.
     95            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a GlobalQuest object through XML.
    9696
    97             virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
    98             virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
     97            virtual bool fail(PlayerInfo* player) override; //!< Fails the Quest.
     98            virtual bool complete(PlayerInfo* player) override; //!< Completes the Quest.
    9999
    100100        protected:
    101             virtual bool isStartable(const PlayerInfo* player) const; //!< Checks whether the Quest can be started.
    102             virtual bool isFailable(const PlayerInfo* player) const; //!< Checks whether the Quest can be failed.
    103             virtual bool isCompletable(const PlayerInfo* player) const; //!< Checks whether the Quest can be completed.
     101            virtual bool isStartable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be started.
     102            virtual bool isFailable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be failed.
     103            virtual bool isCompletable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be completed.
    104104
    105             virtual QuestStatus::Value getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
     105            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const override; //!< Returns the status of the Quest for a specific player.
    106106
    107             virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status); //!< Sets the status for a specific player.
     107            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status) override; //!< Sets the status for a specific player.
    108108
    109109        private:

  • code/branches/cpp11_v2/src/modules/questsystem/LocalQuest.h

    r9667 r10817  
    8787            virtual ~LocalQuest();
    8888
    89             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a LocalQuest object through XML.
     89            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a LocalQuest object through XML.
    9090
    91             virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
    92             virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
     91            virtual bool fail(PlayerInfo* player) override; //!< Fails the Quest.
     92            virtual bool complete(PlayerInfo* player) override; //!< Completes the Quest.
    9393
    9494        protected:
    95             virtual bool isStartable(const PlayerInfo* player) const; //!< Checks whether the Quest can be started.
    96             virtual bool isFailable(const PlayerInfo* player) const; //!< Checks whether the Quest can be failed.
    97             virtual bool isCompletable(const PlayerInfo* player) const; //!< Checks whether the Quest can be completed.
     95            virtual bool isStartable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be started.
     96            virtual bool isFailable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be failed.
     97            virtual bool isCompletable(const PlayerInfo* player) const override; //!< Checks whether the Quest can be completed.
    9898
    99             virtual QuestStatus::Value getStatus(const PlayerInfo* player) const; //!< Returns the status of the Quest for a specific player.
    100             virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status); //!< Sets the status for a specific player.
     99            virtual QuestStatus::Value getStatus(const PlayerInfo* player) const override; //!< Returns the status of the Quest for a specific player.
     100            virtual bool setStatus(PlayerInfo* player, const QuestStatus::Value & status) override; //!< Sets the status for a specific player.
    101101
    102102        private:

  • code/branches/cpp11_v2/src/modules/questsystem/Quest.h

    r9667 r10817  
    8585            virtual ~Quest();
    8686
    87             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Quest object through XML.
     87            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Quest object through XML.
    8888
    8989            /**

  • code/branches/cpp11_v2/src/modules/questsystem/QuestDescription.h

    r9667 r10817  
    6767            virtual ~QuestDescription();
    6868
    69             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestDescription object through XML.
     69            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestDescription object through XML.
    7070
    7171// tolua_begin

  • code/branches/cpp11_v2/src/modules/questsystem/QuestEffectBeacon.h

    r9667 r10817  
    9696            virtual ~QuestEffectBeacon();
    9797
    98             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestEffectBeacon object through XML.
    99             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
     98            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestEffectBeacon object through XML.
     99            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    100100
    101101            bool execute(bool bTriggered, BaseObject* trigger); //!< Executes the QuestEffects of the QuestEffectBeacon.

  • code/branches/cpp11_v2/src/modules/questsystem/QuestHint.h

    r9667 r10817  
    8585            virtual ~QuestHint();
    8686
    87             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestHint object through XML.
     87            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestHint object through XML.
    8888
    8989            bool isActive(const PlayerInfo* player) const; //!< Returns true if the QuestHint is active for the input player.

  • code/branches/cpp11_v2/src/modules/questsystem/QuestItem.h

    r9667 r10817  
    6363            virtual ~QuestItem();
    6464
    65             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestItem object through XML.
     65            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestItem object through XML.
    6666
    6767            /**

  • code/branches/cpp11_v2/src/modules/questsystem/QuestListener.h

    r9667 r10817  
    9090            virtual ~QuestListener();
    9191
    92             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a QuestListener object through XML.
     92            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a QuestListener object through XML.
    9393
    9494            static void advertiseStatusChange(std::list<QuestListener*> & listeners, const std::string & status); //!< Makes all QuestListener in the list aware that a certain status change has occured.

  • code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuest.h

    r9667 r10817  
    6262        virtual ~AddQuest();
    6363
    64         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddQuest object through XML.
     64        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddQuest object through XML.
    6565
    66         virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
     66        virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
    6767
    6868    };

  • code/branches/cpp11_v2/src/modules/questsystem/effects/AddQuestHint.h

    r9667 r10817  
    6464            virtual ~AddQuestHint();
    6565
    66             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddQuestHint object through XML.
     66            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddQuestHint object through XML.
    6767
    68             virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
     68            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
    6969
    7070        private:

  • code/branches/cpp11_v2/src/modules/questsystem/effects/AddReward.h

    r9667 r10817  
    6868            virtual ~AddReward();
    6969
    70             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a AddReward object through XML.
     70            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a AddReward object through XML.
    7171
    72             virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
     72            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
    7373
    7474        private:

  • code/branches/cpp11_v2/src/modules/questsystem/effects/ChangeQuestStatus.h

    r9667 r10817  
    5959            virtual ~ChangeQuestStatus();
    6060
    61             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a ChangeQuestStatus object through XML.
     61            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a ChangeQuestStatus object through XML.
    6262
    6363            virtual bool invoke(PlayerInfo* player) = 0; //!< Invokes the QuestEffect.

  • code/branches/cpp11_v2/src/modules/questsystem/effects/CompleteQuest.h

    r9667 r10817  
    6262            virtual ~CompleteQuest();
    6363
    64             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a CompleteQuest object through XML.
     64            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a CompleteQuest object through XML.
    6565
    66             virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
     66            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
    6767
    6868    };

  • code/branches/cpp11_v2/src/modules/questsystem/effects/FailQuest.h

    r9667 r10817  
    6262            virtual ~FailQuest();
    6363
    64             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a FailQuest object through XML.
     64            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a FailQuest object through XML.
    6565
    66             virtual bool invoke(PlayerInfo* player); //!< Invokes the QuestEffect.
     66            virtual bool invoke(PlayerInfo* player) override; //!< Invokes the QuestEffect.
    6767
    6868    };

  • code/branches/cpp11_v2/src/modules/tetris/Tetris.h

    r10769 r10817  
    5858            virtual ~Tetris(); //!< Destructor. Cleans up, if initialized.
    5959
    60             virtual void start(void); //!< Starts the Tetris minigame.
    61             virtual void end(void); ///!< Ends the Tetris minigame.
     60            virtual void start(void) override; //!< Starts the Tetris minigame.
     61            virtual void end(void) override; ///!< Ends the Tetris minigame.
    6262
    63             virtual void tick(float dt);
     63            virtual void tick(float dt) override;
    6464
    65             virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
    66             virtual bool playerLeft(PlayerInfo* player);
     65            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
     66            virtual bool playerLeft(PlayerInfo* player) override;
    6767
    6868            void setCenterpoint(TetrisCenterpoint* center);
    … …  
    7777
    7878        protected:
    79             virtual void spawnPlayersIfRequested(); //!< Spawns player.
     79            virtual void spawnPlayersIfRequested() override; //!< Spawns player.
    8080
    8181

  • code/branches/cpp11_v2/src/modules/tetris/TetrisBrick.h

    r10262 r10817  
    5757            virtual ~TetrisBrick() {}
    5858
    59             virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
    60             virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
    61             virtual void changedPlayer(); //!< Is called when the player changed.
     59            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
     60            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
     61            virtual void changedPlayer() override; //!< Is called when the player changed.
    6262
    6363            bool isValidMove(const Vector3& position, bool isRotation);

  • code/branches/cpp11_v2/src/modules/tetris/TetrisCenterpoint.h

    r10624 r10817  
    6262            virtual ~TetrisCenterpoint() {}
    6363
    64             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method to create a TetrisCenterpoint through XML.
     64            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method to create a TetrisCenterpoint through XML.
    6565
    6666            /**

  • code/branches/cpp11_v2/src/modules/tetris/TetrisScore.h

    r10262 r10817  
    6060            virtual ~TetrisScore();
    6161
    62             virtual void tick(float dt); //!< Creates and sets the caption to be displayed by the TetrisScore.
    63             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    64             virtual void changedOwner(); //!< Is called when the owner changes.
     62            virtual void tick(float dt) override; //!< Creates and sets the caption to be displayed by the TetrisScore.
     63            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     64            virtual void changedOwner() override; //!< Is called when the owner changes.
    6565
    6666        private:

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefense.h

    r10769 r10817  
    5353        virtual ~TowerDefense();       
    5454        void addTowerDefenseEnemy(int templatenr);
    55         virtual void start(); //<! The function is called when the gametype starts
    56         virtual void end();
    57         virtual void tick(float dt);
    58         virtual void spawnPlayer(PlayerInfo* player);
     55        virtual void start() override; //<! The function is called when the gametype starts
     56        virtual void end() override;
     57        virtual void tick(float dt) override;
     58        virtual void spawnPlayer(PlayerInfo* player) override;
    5959        PlayerInfo* getPlayer(void) const;
    6060        int getCredit(){ return this->credit_; }

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseCenterpoint.h

    r10629 r10817  
    5252            virtual ~TowerDefenseCenterpoint() {}
    5353
    54             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     54            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5555
    5656            /**

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseEnemy.h

    r10629 r10817  
    3737        //health gibt es unter: health_
    3838
    39         virtual void tick(float dt);
     39        virtual void tick(float dt) override;
    4040        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
    4141

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseField.h

    r10629 r10817  
    6262            TowerDefenseField(Context* context);
    6363            virtual ~TowerDefenseField() {}
    64             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     64            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6565            const bool isFree() const
    6666                { return type_==FREE; }

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseHUDController.h

    r10258 r10817  
    5353
    5454
    55         virtual void tick(float dt);
    56         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    57         virtual void changedOwner();
     55        virtual void tick(float dt) override;
     56        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     57        virtual void changedOwner() override;
    5858        void setShowlives(bool temp)
    5959            { this->showlives = temp; }

  • code/branches/cpp11_v2/src/modules/towerdefense/TowerDefenseSelecter.h

    r10629 r10817  
    4141            TowerDefenseSelecter(Context* context); //!< Constructor. Registers and initializes the object.
    4242            virtual ~TowerDefenseSelecter();
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);         
    44             virtual void tick(float dt);           
    45             virtual void moveFrontBack(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
    46             virtual void moveRightLeft(const Vector2& value); //!< Overloaded the function to steer the bat up and down.
    47             virtual void rotateYaw(const Vector2& value);
    48             virtual void rotatePitch(const Vector2& value);
    49             virtual void rotateRoll(const Vector2& value);
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;         
     44            virtual void tick(float dt) override;           
     45            virtual void moveFrontBack(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
     46            virtual void moveRightLeft(const Vector2& value) override; //!< Overloaded the function to steer the bat up and down.
     47            virtual void rotateYaw(const Vector2& value) override;
     48            virtual void rotatePitch(const Vector2& value) override;
     49            virtual void rotateRoll(const Vector2& value) override;
    5050            void fire(unsigned int firemode);
    51             virtual void fired(unsigned int firemode);
    52             virtual void boost(bool bBoost);
     51            virtual void fired(unsigned int firemode) override;
     52            virtual void boost(bool bBoost) override;
    5353            virtual void setSelectedPosition(TDCoordinate* newPos);
    5454            virtual void setSelectedPosition(int x, int y);

  • code/branches/cpp11_v2/src/modules/weapons/IceGunFreezer.h

    r10629 r10817  
    5555            IceGunFreezer(Context* context);
    5656            virtual ~IceGunFreezer();
    57             virtual void tick(float dt);
     57            virtual void tick(float dt) override;
    5858            virtual void startFreezing();
    5959            virtual void stopFreezing();

  • code/branches/cpp11_v2/src/modules/weapons/RocketController.cc

    r10258 r10817  
    3838#include "projectiles/SimpleRocket.h"
    3939#include "weaponmodes/SimpleRocketFire.h"
     40#include "core/CoreIncludes.h"
    4041
    4142namespace orxonox

  • code/branches/cpp11_v2/src/modules/weapons/RocketController.h

    r9667 r10817  
    5555            virtual ~RocketController();
    5656
    57             virtual void tick(float dt);
     57            virtual void tick(float dt) override;
    5858            /**
    5959            @brief Get the rocket that is controlled by this controller.

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/BillboardProjectile.h

    r10629 r10817  
    6161            virtual void setMaterial(const std::string& material);
    6262            virtual const std::string& getMaterial();
    63             virtual void changedVisibility();
     63            virtual void changedVisibility() override;
    6464
    6565        private:

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBomb.h

    r10622 r10817  
    4141            GravityBomb(Context* context);
    4242            virtual ~GravityBomb();
    43             virtual void tick(float dt);
     43            virtual void tick(float dt) override;
    4444
    45             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
     45            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
    4646            void detonate();
    4747        private:

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/GravityBombField.h

    r10622 r10817  
    3939    GravityBombField(Context* context);
    4040    virtual ~GravityBombField();
    41     virtual void tick(float dt);
     41    virtual void tick(float dt) override;
    4242    virtual void destroy();
    4343

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/IceGunProjectile.h

    r10629 r10817  
    6262
    6363        protected:
    64             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
     64            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
    6565        private:         
    6666            float freezeTime_; //The duration of the freezing effect on a target

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/LightningGunProjectile.h

    r9667 r10817  
    5858            virtual ~LightningGunProjectile() {}
    5959
    60             virtual void setMaterial(const std::string& material);
     60            virtual void setMaterial(const std::string& material) override;
    6161
    6262        private:

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/ParticleProjectile.h

    r9667 r10817  
    5353            ParticleProjectile(Context* context);
    5454            virtual ~ParticleProjectile();
    55             virtual void changedVisibility();
     55            virtual void changedVisibility() override;
    5656
    5757        private:

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/Projectile.h

    r10629 r10817  
    6464            void setConfigValues();
    6565
    66             virtual void tick(float dt);
    67             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
     66            virtual void tick(float dt) override;
     67            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
    6868
    6969        protected:

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/Rocket.h

    r10216 r10817  
    6262            virtual ~Rocket();
    6363
    64             virtual void tick(float dt); //!< Defines which actions the Rocket has to take in each tick.
     64            virtual void tick(float dt) override; //!< Defines which actions the Rocket has to take in each tick.
    6565
    66             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
    67             virtual void destroyObject(void);
     66            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
     67            virtual void destroyObject(void) override;
    6868            void destructionEffect();
    6969
    70             virtual void moveFrontBack(const Vector2& value) {}
    71             virtual void moveRightLeft(const Vector2& value) {}
    72             virtual void moveUpDown(const Vector2& value) {}
     70            virtual void moveFrontBack(const Vector2& value) override {}
     71            virtual void moveRightLeft(const Vector2& value) override {}
     72            virtual void moveUpDown(const Vector2& value) override {}
    7373
    74             virtual void rotateYaw(const Vector2& value);
    75             virtual void rotatePitch(const Vector2& value);
    76             virtual void rotateRoll(const Vector2& value);
     74            virtual void rotateYaw(const Vector2& value) override;
     75            virtual void rotatePitch(const Vector2& value) override;
     76            virtual void rotateRoll(const Vector2& value) override;
    7777
    7878            /**
    … …  
    114114                { this->rotateRoll(Vector2(value, 0)); }
    115115
    116             virtual void setShooter(Pawn* shooter);
     116            virtual void setShooter(Pawn* shooter) override;
    117117
    118             virtual void fired(unsigned int firemode);
     118            virtual void fired(unsigned int firemode) override;
    119119
    120120        private:

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/RocketOld.h

    r10622 r10817  
    6262            virtual ~RocketOld();
    6363
    64             virtual void tick(float dt); //!< Defines which actions the RocketOld has to take in each tick.
     64            virtual void tick(float dt) override; //!< Defines which actions the RocketOld has to take in each tick.
    6565
    66             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
    67             virtual void destroyObject(void);
     66            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
     67            virtual void destroyObject(void) override;
    6868            void destructionEffect();
    6969
    70             virtual void moveFrontBack(const Vector2& value) {}
    71             virtual void moveRightLeft(const Vector2& value) {}
    72             virtual void moveUpDown(const Vector2& value) {}
     70            virtual void moveFrontBack(const Vector2& value) override {}
     71            virtual void moveRightLeft(const Vector2& value) override {}
     72            virtual void moveUpDown(const Vector2& value) override {}
    7373
    74             virtual void rotateYaw(const Vector2& value);
    75             virtual void rotatePitch(const Vector2& value);
    76             virtual void rotateRoll(const Vector2& value);
     74            virtual void rotateYaw(const Vector2& value) override;
     75            virtual void rotatePitch(const Vector2& value) override;
     76            virtual void rotateRoll(const Vector2& value) override;
    7777
    7878            /**
    … …  
    114114                { this->rotateRoll(Vector2(value, 0)); }
    115115
    116             virtual void setShooter(Pawn* shooter);
     116            virtual void setShooter(Pawn* shooter) override;
    117117
    118             virtual void fired(unsigned int firemode);
     118            virtual void fired(unsigned int firemode) override;
    119119
    120120        private:

  • code/branches/cpp11_v2/src/modules/weapons/projectiles/SimpleRocket.h

    r10216 r10817  
    6262            SimpleRocket(Context* context);
    6363            virtual ~SimpleRocket();
    64             virtual void tick(float dt);
     64            virtual void tick(float dt) override;
    6565
    66             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
     66            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
    6767
    6868            void disableFire(); //!< Method to disable the fire and stop all acceleration
    6969
    70             virtual void moveFrontBack(const Vector2& value){}
    71             virtual void moveRightLeft(const Vector2& value){}
    72             virtual void moveUpDown(const Vector2& value){}
     70            virtual void moveFrontBack(const Vector2& value) override{}
     71            virtual void moveRightLeft(const Vector2& value) override{}
     72            virtual void moveUpDown(const Vector2& value) override{}
    7373
    74             virtual void rotateYaw(const Vector2& value);
    75             virtual void rotatePitch(const Vector2& value);
    76             virtual void rotateRoll(const Vector2& value);
     74            virtual void rotateYaw(const Vector2& value) override;
     75            virtual void rotatePitch(const Vector2& value) override;
     76            virtual void rotateRoll(const Vector2& value) override;
    7777            void setDestroy();
    7878
    … …  
    115115                { this->rotateRoll(Vector2(value, 0)); }
    116116
    117             virtual void setShooter(Pawn* shooter);
     117            virtual void setShooter(Pawn* shooter) override;
    118118
    119119            inline bool hasFuel() const

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/EnergyDrink.h

    r9667 r10817  
    5757            virtual ~EnergyDrink() {}
    5858
    59             virtual void fire();
    60             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     59            virtual void fire() override;
     60            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6161
    6262        private:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/FusionFire.h

    r9667 r10817  
    5454            virtual ~FusionFire() {}
    5555
    56             virtual void fire();
     56            virtual void fire() override;
    5757
    5858        private:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/GravityBombFire.h

    r10622 r10817  
    3434            virtual ~GravityBombFire();
    3535
    36             virtual void fire();
     36            virtual void fire() override;
    3737
    3838        private:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/HsW01.h

    r9945 r10817  
    5656            virtual ~HsW01();
    5757
    58             virtual void fire();
    59             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     58            virtual void fire() override;
     59            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6060
    6161        protected:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/IceGun.h

    r10629 r10817  
    5454            virtual ~IceGun();
    5555
    56             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    57             virtual void fire();
     56            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     57            virtual void fire() override;
    5858           
    5959            inline void setFreezeTime(float freezeTime)

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LaserFire.h

    r9667 r10817  
    5454            virtual ~LaserFire() {}
    5555
    56             virtual void fire();
     56            virtual void fire() override;
    5757
    5858        private:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/LightningGun.h

    r9667 r10817  
    5454            virtual ~LightningGun();
    5555
    56             virtual void fire();
     56            virtual void fire() override;
    5757
    5858       private:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFire.h

    r9667 r10817  
    5454            virtual ~RocketFire();
    5555
    56             virtual void fire();
     56            virtual void fire() override;
    5757
    5858        private:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/RocketFireOld.h

    r10622 r10817  
    5454            virtual ~RocketFireOld();
    5555
    56             virtual void fire();
     56            virtual void fire() override;
    5757
    5858        private:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SimpleRocketFire.h

    r9667 r10817  
    5353            virtual ~SimpleRocketFire();
    5454            void deactivateFire();
    55             virtual void fire();
     55            virtual void fire() override;
    5656
    5757        private:

  • code/branches/cpp11_v2/src/modules/weapons/weaponmodes/SplitGun.h

    r10629 r10817  
    5454            virtual ~SplitGun();
    5555
    56             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    57             virtual void fire();
     56            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     57            virtual void fire() override;
    5858
    5959            inline void setNumberOfSplits(int numberOfSplits)

  • code/branches/cpp11_v2/src/orxonox/Level.h

    r10624 r10817  
    4747            virtual ~Level();
    4848
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050
    5151            void playerEntered(PlayerInfo* player);

  • code/branches/cpp11_v2/src/orxonox/LevelInfo.h

    r9667 r10817  
    207207            virtual ~LevelInfo();
    208208
    209             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a LevelInfo object through XML.
     209            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Creates a LevelInfo object through XML.
    210210
    211211            /**

  • code/branches/cpp11_v2/src/orxonox/PlayerManager.h

    r5966 r10817  
    5050                { return this->clients_; }
    5151
    52             void clientConnected(unsigned int clientID);
    53             void clientDisconnected(unsigned int clientID);
     52            void clientConnected(unsigned int clientID) override;
     53            void clientDisconnected(unsigned int clientID) override;
    5454            void disconnectAllClients();
    5555

  • code/branches/cpp11_v2/src/orxonox/Radar.h

    r9667 r10817  
    5454        virtual ~Radar();
    5555
    56         virtual void tick(float dt);
     56        virtual void tick(float dt) override;
    5757
    5858        const RadarViewable* getFocus();

  • code/branches/cpp11_v2/src/orxonox/Scene.h

    r10768 r10817  
    5151            virtual ~Scene();
    5252
    53             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     53            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5454            void registerVariables();
    5555
    … …  
    7979                { return this->radar_; }
    8080
    81             inline virtual uint32_t getSceneID() const { return this->getObjectID(); }
     81            inline virtual uint32_t getSceneID() const override { return this->getObjectID(); }
    8282
    83             virtual void tick(float dt);
     83            virtual void tick(float dt) override;
    8484
    8585        private:

  • code/branches/cpp11_v2/src/orxonox/chat/ChatHistory.h

    r10624 r10817  
    8282       * \param senderID Identification number of the sender
    8383       */
    84       virtual void incomingChat(const std::string& message, const std::string& name);
     84      virtual void incomingChat(const std::string& message, const std::string& name) override;
    8585
    8686      /** Synchronize logfile onto the hard drive

  • code/branches/cpp11_v2/src/orxonox/chat/ChatInputHandler.h

    r9675 r10817  
    125125       * history window of the full chat window)
    126126       */
    127       void incomingChat(const std::string& message, const std::string& name);
     127      void incomingChat(const std::string& message, const std::string& name) override;
    128128
    129129      /** \param full true means show full chat window with history,

  • code/branches/cpp11_v2/src/orxonox/chat/ChatManager.h

    r8858 r10817  
    5555            ChatManager(const ChatManager&);
    5656
    57             virtual void incomingChat(const std::string& message, unsigned int sourceID);
     57            virtual void incomingChat(const std::string& message, unsigned int sourceID) override;
    5858
    5959            static ChatManager* singletonPtr_s;

  • code/branches/cpp11_v2/src/orxonox/collisionshapes/CollisionShape.h

    r10765 r10817  
    6161            virtual ~CollisionShape();
    6262
    63             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     63            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6464
    6565            /**

  • code/branches/cpp11_v2/src/orxonox/collisionshapes/CompoundCollisionShape.h

    r10768 r10817  
    6161            virtual ~CompoundCollisionShape();
    6262
    63             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     63            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6464
    6565            void attach(CollisionShape* shape);
    … …  
    7070            void updateAttachedShape(CollisionShape* shape);
    7171
    72             virtual void changedScale();
     72            virtual void changedScale() override;
    7373
    7474        private:
    7575            void updatePublicShape();
    76             inline virtual btCollisionShape* createNewShape() const
     76            inline virtual btCollisionShape* createNewShape() const override
    7777                { assert(false); return nullptr; }
    7878

  • code/branches/cpp11_v2/src/orxonox/collisionshapes/WorldEntityCollisionShape.h

    r10624 r10817  
    4646
    4747        protected:
    48             virtual void updateParent();
     48            virtual void updateParent() override;
    4949
    5050        private:
    51             void parentChanged();
     51            void parentChanged() override;
    5252
    5353            WorldEntity* worldEntityOwner_;

  • code/branches/cpp11_v2/src/orxonox/controllers/AIController.h

    r9667 r10817  
    4444            virtual ~AIController();
    4545
    46             virtual void tick(float dt); //<! Carrying out the targets set in action().
     46            virtual void tick(float dt) override; //<! Carrying out the targets set in action().
    4747
    4848        protected:

  • code/branches/cpp11_v2/src/orxonox/controllers/ArtificialController.h

    r10769 r10817  
    4242            virtual ~ArtificialController();
    4343
    44             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     44            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4545
    4646            void abandonTarget(Pawn* target);
    4747
    48             virtual void changedControllableEntity();
     48            virtual void changedControllableEntity() override;
    4949
    5050            virtual void doFire();

  • code/branches/cpp11_v2/src/orxonox/controllers/Controller.h

    r9797 r10817  
    4545            Controller(Context* context);
    4646            virtual ~Controller();
    47             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     47            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4848            inline void setPlayer(PlayerInfo* player)
    4949                { this->player_ = player; }

  • code/branches/cpp11_v2/src/orxonox/controllers/ControllerDirector.h

    r10622 r10817  
    4343            virtual ~ControllerDirector() { }
    4444
    45             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     45            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4646            bool party(bool bTriggered, BaseObject* trigger);
    47             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
     47            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    4848
    4949            inline void setScriptName(const std::string& name) { this->scriptname_ = name; }

  • code/branches/cpp11_v2/src/orxonox/controllers/DroneController.h

    r9667 r10817  
    5353            virtual ~DroneController();
    5454
    55             virtual void tick(float dt); //!< The controlling happens here. This method defines what the controller has to do each tick.
     55            virtual void tick(float dt) override; //!< The controlling happens here. This method defines what the controller has to do each tick.
    5656
    5757            void setOwner(Pawn* owner);

  • code/branches/cpp11_v2/src/orxonox/controllers/FormationController.h

    r10631 r10817  
    5050      virtual ~FormationController();
    5151
    52       virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     52      virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5353
    5454
    … …  
    9393           { return this->formationMode_; }
    9494
    95       virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
     95      virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
    9696
    9797      FormationController* getMaster( void ) { return myMaster_; }
    … …  
    9999      FormationController* getSlave( void ) { return this->slaves_.back(); }
    100100
    101       virtual void changedControllableEntity();
     101      virtual void changedControllableEntity() override;
    102102
    103103  protected:

  • code/branches/cpp11_v2/src/orxonox/controllers/HumanController.h

    r10624 r10817  
    4747            virtual ~HumanController();
    4848
    49             virtual void tick(float dt);
     49            virtual void tick(float dt) override;
    5050
    5151            static void moveFrontBack(const Vector2& value);

  • code/branches/cpp11_v2/src/orxonox/controllers/NewHumanController.h

    r9667 r10817  
    4545            virtual ~NewHumanController();
    4646
    47             virtual void tick(float dt);
     47            virtual void tick(float dt) override;
    4848
    49             virtual void frontback(const Vector2& value);
    50             virtual void yaw(const Vector2& value);
    51             virtual void pitch(const Vector2& value);
     49            virtual void frontback(const Vector2& value) override;
     50            virtual void yaw(const Vector2& value) override;
     51            virtual void pitch(const Vector2& value) override;
    5252
    5353            static void accelerate();
    5454            static void decelerate();
    5555
    56             virtual void doFire(unsigned int firemode);
     56            virtual void doFire(unsigned int firemode) override;
    5757
    58             virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage);
     58            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) override;
    5959
    6060            static void unfire();
    … …  
    6565            static void changeMode();
    6666
    67             virtual void changedControllableEntity();
    68             virtual void doPauseControl();
    69             virtual void doResumeControl();
     67            virtual void changedControllableEntity() override;
     68            virtual void doPauseControl() override;
     69            virtual void doResumeControl() override;
    7070
    7171            float getCurrentYaw(){ return this->currentYaw_; }

  • code/branches/cpp11_v2/src/orxonox/controllers/ScriptController.h

    r10622 r10817  
    7171            void setPlayer(PlayerInfo* player) { this->player_ = player; }
    7272           
    73             virtual void tick(float dt);
     73            virtual void tick(float dt) override;
    7474
    7575            // LUA interface

  • code/branches/cpp11_v2/src/orxonox/controllers/WaypointController.h

    r9667 r10817  
    4444            virtual ~WaypointController();
    4545
    46             virtual void tick(float dt);
     46            virtual void tick(float dt) override;
    4747
    4848        protected:

  • code/branches/cpp11_v2/src/orxonox/controllers/WaypointPatrolController.h

    r9716 r10817  
    4343            virtual ~WaypointPatrolController() {}
    4444
    45             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    46             virtual void tick(float dt);
     45            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     46            virtual void tick(float dt) override;
    4747
    4848            inline void setAlertnessRadius(float radius)

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSClient.h

    r7163 r10817  
    4343        ~GSClient();
    4444
    45         void activate();
    46         void deactivate();
    47         void update(const Clock& time);
     45        void activate() override;
     46        void deactivate() override;
     47        void update(const Clock& time) override;
    4848    };
    4949}

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSGraphics.h

    r6417 r10817  
    5353        ~GSGraphics();
    5454
    55         void activate();
    56         void deactivate();
    57         void update(const Clock& time);
     55        void activate() override;
     56        void deactivate() override;
     57        void update(const Clock& time) override;
    5858
    5959    private:

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.h

    r10624 r10817  
    4444        ~GSLevel();
    4545
    46         void activate();
    47         void deactivate();
    48         void update(const Clock& time);
     46        void activate() override;
     47        void deactivate() override;
     48        void update(const Clock& time) override;
    4949
    5050        static void startMainMenu(void); //!< Starts the MainMenu

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.h

    r9667 r10817  
    4444        ~GSMainMenu();
    4545
    46         void activate();
    47         void deactivate();
    48         void update(const Clock& time);
     46        void activate() override;
     47        void deactivate() override;
     48        void update(const Clock& time) override;
    4949
    5050        void setConfigValues();

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSMasterServer.h

    r7801 r10817  
    4545      ~GSMasterServer();
    4646
    47       void activate();
    48       void deactivate();
    49       void update(const Clock& time);
     47      void activate() override;
     48      void deactivate() override;
     49      void update(const Clock& time) override;
    5050
    5151    private:

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSRoot.h

    r8706 r10817  
    4444        static void printObjects();
    4545
    46         void activate();
    47         void deactivate();
    48         void update(const Clock& time);
     46        void activate() override;
     47        void deactivate() override;
     48        void update(const Clock& time) override;
    4949
    5050        // this has to be public because proteced triggers a bug in msvc
    … …  
    5959
    6060    protected:
    61         virtual void changedTimeFactor(float factor_new, float factor_old);
     61        virtual void changedTimeFactor(float factor_new, float factor_old) override;
    6262
    6363    private:

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSServer.h

    r5929 r10817  
    4343        ~GSServer();
    4444
    45         void activate();
    46         void deactivate();
    47         void update(const Clock& time);
     45        void activate() override;
     46        void deactivate() override;
     47        void update(const Clock& time) override;
    4848
    4949    private:

  • code/branches/cpp11_v2/src/orxonox/gamestates/GSStandalone.h

    r5929 r10817  
    4141        ~GSStandalone();
    4242
    43         void activate();
    44         void deactivate();
    45         void update(const Clock& time);
     43        void activate() override;
     44        void deactivate() override;
     45        void update(const Clock& time) override;
    4646
    4747    private:

  • code/branches/cpp11_v2/src/orxonox/gametypes/Asteroids.h

    r10768 r10817  
    4141            virtual ~Asteroids() {}
    4242
    43             virtual void tick(float dt);
     43            virtual void tick(float dt) override;
    4444
    45             virtual void start();
    46             virtual void end();
     45            virtual void start() override;
     46            virtual void end() override;
    4747
    4848            inline void firstCheckpointReached(bool reached)
    … …  
    5050
    5151        protected:
    52             virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
     52            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
    5353
    5454        private:

  • code/branches/cpp11_v2/src/orxonox/gametypes/Deathmatch.h

    r10768 r10817  
    4141            virtual ~Deathmatch() {}
    4242
    43             virtual void start();
    44             virtual void end();
    45             virtual void playerEntered(PlayerInfo* player);
    46             virtual bool playerLeft(PlayerInfo* player);
    47             virtual bool playerChangedName(PlayerInfo* player);
     43            virtual void start() override;
     44            virtual void end() override;
     45            virtual void playerEntered(PlayerInfo* player) override;
     46            virtual bool playerLeft(PlayerInfo* player) override;
     47            virtual bool playerChangedName(PlayerInfo* player) override;
    4848
    49             virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
    50             virtual void playerScored(PlayerInfo* player, int score = 1);
     49            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
     50            virtual void playerScored(PlayerInfo* player, int score = 1) override;
    5151    };
    5252}

  • code/branches/cpp11_v2/src/orxonox/gametypes/Dynamicmatch.h

    r10768 r10817  
    6464            bool tutorial; //goal: new players receive messages how the new gametype works - later it can be switched off.
    6565
    66             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //ok - score function and management of parties
    67             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //ok - simple
    68             virtual void start();
    69             virtual void end(); //Wie geht das mit der Punkteausgabe aendern? Z.B: Persoenliche Nachricht?
    70             virtual void playerEntered(PlayerInfo* player);
    71             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);//is used to initialize the player's party and colour
    72             virtual bool playerLeft(PlayerInfo* player);
    73             virtual bool playerChangedName(PlayerInfo* player);//unchanged
     66            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //ok - score function and management of parties
     67            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //ok - simple
     68            virtual void start() override;
     69            virtual void end() override; //Wie geht das mit der Punkteausgabe aendern? Z.B: Persoenliche Nachricht?
     70            virtual void playerEntered(PlayerInfo* player) override;
     71            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override;//is used to initialize the player's party and colour
     72            virtual bool playerLeft(PlayerInfo* player) override;
     73            virtual bool playerChangedName(PlayerInfo* player) override;//unchanged
    7474
    7575            /*virtual void instructions();
    … …  
    7878            void grantPigBoost(SpaceShip* spaceship); // Grant the piggy a boost.
    7979            void resetSpeedFactor(SpaceShip* spaceship);
    80             void tick (float dt);// used to end the game
    81             SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
     80            void tick (float dt) override;// used to end the game
     81            SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
    8282
    8383

  • code/branches/cpp11_v2/src/orxonox/gametypes/Gametype.h

    r10768 r10817  
    7676            void setConfigValues();
    7777
    78             virtual void tick(float dt);
     78            virtual void tick(float dt) override;
    7979
    8080            inline const GametypeInfo* getGametypeInfo() const
    … …  
    175175            virtual void spawnDeadPlayersIfRequested();
    176176
    177             virtual GSLevelMementoState* exportMementoState();
    178             virtual void importMementoState(const std::vector<GSLevelMementoState*>& states);
     177            virtual GSLevelMementoState* exportMementoState() override;
     178            virtual void importMementoState(const std::vector<GSLevelMementoState*>& states) override;
    179179
    180180            WeakPtr<GametypeInfo> gtinfo_;

  • code/branches/cpp11_v2/src/orxonox/gametypes/LastManStanding.h

    r10768 r10817  
    6161            bool bHardPunishment; //!< Switches between damage and death as punishment.
    6262            float punishDamageRate; //!< Makes Damage adjustable.
    63             virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn.
     63            virtual void spawnDeadPlayersIfRequested() override; //!< Prevents dead players to respawn.
    6464            virtual int getMinLives(); //!< Returns minimum of each player's lives; players with 0 lives are skipped;
    6565
    … …  
    6969            void setConfigValues(); //!< Makes values configurable.
    7070
    71             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
    72             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //!< Manages each players lives.
     71            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //!< If a player shoot's an opponent, his punishment countdown will be resetted.
     72            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //!< Manages each players lives.
    7373
    74             virtual void end(); //!< Sends an end message.
     74            virtual void end() override; //!< Sends an end message.
    7575            int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".
    7676            int getNumPlayersAlive() const; //!< Returns the number of players that are still alive.
    77             virtual void playerEntered(PlayerInfo* player); //!< Initializes values.
    78             virtual bool playerLeft(PlayerInfo* player); //!< Manages all local variables.
    79             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn); //!< Resets punishment time and respawn delay.
     77            virtual void playerEntered(PlayerInfo* player) override; //!< Initializes values.
     78            virtual bool playerLeft(PlayerInfo* player) override; //!< Manages all local variables.
     79            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override; //!< Resets punishment time and respawn delay.
    8080
    8181            void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
    82             void tick (float dt); //!< used to end the game
     82            void tick (float dt) override; //!< used to end the game
    8383    };
    8484}

  • code/branches/cpp11_v2/src/orxonox/gametypes/LastTeamStanding.h

    r10768 r10817  
    6767            std::map<PlayerInfo*, bool> inGame_; //!< Indicates each Player's state.
    6868
    69             virtual void spawnDeadPlayersIfRequested(); //!< Prevents dead players to respawn.
     69            virtual void spawnDeadPlayersIfRequested() override; //!< Prevents dead players to respawn.
    7070            virtual int getMinLives(); //!< Returns minimum of each player's lives; players with 0 lives are skipped;
    7171
    … …  
    7474            virtual ~LastTeamStanding(); //!< Default Destructor.
    7575
    76             virtual void playerEntered(PlayerInfo* player); //!< Initializes values.
    77             virtual bool playerLeft(PlayerInfo* player); //!< Manages all local variables.
     76            virtual void playerEntered(PlayerInfo* player) override; //!< Initializes values.
     77            virtual bool playerLeft(PlayerInfo* player) override; //!< Manages all local variables.
    7878
    79             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr); //!< Manages each player's lost lives.
    80             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr); //!< If a player shoot's an opponent, his punishment countdown will be resetted.
    81             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn); //!< Resets punishment time and respawn delay.
    82             void tick (float dt); //!< used to end the game
    83             virtual void end(); //!< Sends an end message.
     79            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override; //!< Manages each player's lost lives.
     80            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override; //!< If a player shoot's an opponent, his punishment countdown will be resetted.
     81            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override; //!< Resets punishment time and respawn delay.
     82            void tick (float dt) override; //!< used to end the game
     83            virtual void end() override; //!< Sends an end message.
    8484            void punishPlayer(PlayerInfo* player); //!< Function in order to kill a player. Punishment for hiding longer than "timeRemaining".
    8585            int playerGetLives(PlayerInfo* player); //!< getFunction for the map "playerLives_".

  • code/branches/cpp11_v2/src/orxonox/gametypes/Mission.h

    r10768 r10817  
    4242            virtual ~Mission() {}
    4343
    44             virtual void tick(float dt);
     44            virtual void tick(float dt) override;
    4545
    46             virtual void start();
    47             virtual void end();
     46            virtual void start() override;
     47            virtual void end() override;
    4848            virtual void setTeams();
    49             virtual void addBots(unsigned int amount){} //<! overwrite function in order to bypass the addbots command
     49            virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
    5050            inline void setLives(unsigned int amount)
    5151                {this->lives_ = amount;}
    … …  
    5858
    5959        protected:
    60             virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
     60            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
    6161            bool missionAccomplished_; //<! indicates if player successfully finsihed the mission;
    6262            int lives_; //<! amount of player's lives <-> nr. of retries

  • code/branches/cpp11_v2/src/orxonox/gametypes/TeamBaseMatch.h

    r10768 r10817  
    4444            virtual ~TeamBaseMatch() {}
    4545
    46             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
    47             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator);
     46            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
     47            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
    4848
    49             virtual void playerScored(PlayerInfo* player, int score = 1);
     49            virtual void playerScored(PlayerInfo* player, int score = 1) override;
    5050            virtual void showPoints();
    5151            virtual void endGame();

  • code/branches/cpp11_v2/src/orxonox/gametypes/TeamDeathmatch.h

    r10768 r10817  
    4242
    4343            void setConfigValues();
    44             virtual void start();
    45             virtual void end();
    46             virtual void playerEntered(PlayerInfo* player);
    47             virtual bool playerLeft(PlayerInfo* player);
    48             virtual bool playerChangedName(PlayerInfo* player);
     44            virtual void start() override;
     45            virtual void end() override;
     46            virtual void playerEntered(PlayerInfo* player) override;
     47            virtual bool playerLeft(PlayerInfo* player) override;
     48            virtual bool playerChangedName(PlayerInfo* player) override;
    4949
    50             virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr);
    51             virtual void playerScored(PlayerInfo* player, int score = 1);
     50            virtual void pawnKilled(Pawn* victim, Pawn* killer = nullptr) override;
     51            virtual void playerScored(PlayerInfo* player, int score = 1) override;
    5252       protected:
    5353            int maxScore_;

  • code/branches/cpp11_v2/src/orxonox/gametypes/TeamGametype.h

    r10768 r10817  
    4646            void setConfigValues();
    4747
    48             virtual void playerEntered(PlayerInfo* player);
     48            virtual void playerEntered(PlayerInfo* player) override;
    4949            virtual void findAndSetTeam(PlayerInfo* player);
    50             virtual bool playerLeft(PlayerInfo* player);
    51             virtual void spawnDeadPlayersIfRequested(); //!< Prevents players to respawn.
     50            virtual bool playerLeft(PlayerInfo* player) override;
     51            virtual void spawnDeadPlayersIfRequested() override; //!< Prevents players to respawn.
    5252
    53             virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
    54             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
    55             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
     53            virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr) override;
     54            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override;
     55            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
    5656
    57             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
     57            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn) override;
    5858
    5959
    … …  
    6767
    6868        protected:
    69             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
     69            virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const override;
    7070            bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
    7171

  • code/branches/cpp11_v2/src/orxonox/gametypes/UnderAttack.h

    r10768 r10817  
    4343
    4444            void setConfigValues();
    45             void tick (float dt);
     45            void tick (float dt) override;
    4646            void addDestroyer(Destroyer* destroyer);
    4747            inline Destroyer* getDestroyer() const
    4848                { return this->destroyer_; }
    4949
    50             virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr);
    51             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr);
    52             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr);
    53             virtual void playerEntered(PlayerInfo* player);
     50            virtual bool allowPawnHit(Pawn* victim, Pawn* originator = nullptr) override;
     51            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = nullptr) override;
     52            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = nullptr) override;
     53            virtual void playerEntered(PlayerInfo* player) override;
    5454
    5555        protected:

  • code/branches/cpp11_v2/src/orxonox/graphics/AnimatedModel.h

    r9667 r10817  
    4444            virtual ~AnimatedModel();
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747            void registerVariables();
    4848
    … …  
    5151            virtual void setAnimEnabled(bool enabled);
    5252            virtual void setAnimLoop(bool loop);
    53             virtual void tick(float dt);
     53            virtual void tick(float dt) override;
    5454            virtual void changedMesh();
    5555

  • code/branches/cpp11_v2/src/orxonox/graphics/Backlight.h

    r9667 r10817  
    4444            virtual ~Backlight();
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    48             virtual void tick(float dt);
    49             virtual void changedVisibility();
     48            virtual void tick(float dt) override;
     49            virtual void changedVisibility() override;
    5050
    5151            inline void setWidth(float width)
    … …  
    7474                { return this->trailmaterial_; }
    7575
    76             virtual void changedScale();
     76            virtual void changedScale() override;
    7777
    7878        protected:
    79             virtual void changedTimeFactor(float factor_new, float factor_old);
     79            virtual void changedTimeFactor(float factor_new, float factor_old) override;
    8080
    8181        private:
    8282            void registerVariables();
    83             virtual void startturnonoff();
    84             virtual void stopturnonoff();
    85             virtual void poststopturnonoff();
    86             virtual void changedColour();
     83            virtual void startturnonoff() override;
     84            virtual void stopturnonoff() override;
     85            virtual void poststopturnonoff() override;
     86            virtual void changedColour() override;
    8787            void update_width();
    8888            void update_lifetime();

  • code/branches/cpp11_v2/src/orxonox/graphics/Billboard.h

    r9667 r10817  
    4747            virtual ~Billboard();
    4848
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050
    51             virtual void changedVisibility();
     51            virtual void changedVisibility() override;
    5252
    5353            inline const BillboardSet& getBillboardSet() const
    … …  
    7171
    7272
    73             virtual void setTeamColour(const ColourValue& colour)
     73            virtual void setTeamColour(const ColourValue& colour) override
    7474                { this->setColour(colour); }
    7575               

  • code/branches/cpp11_v2/src/orxonox/graphics/BlinkingBillboard.h

    r9667 r10817  
    4444            virtual ~BlinkingBillboard();
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    48             virtual void tick(float dt);
     48            virtual void tick(float dt) override;
    4949
    5050            inline void setAmplitude(float amplitude)

  • code/branches/cpp11_v2/src/orxonox/graphics/Camera.h

    r9667 r10817  
    5050
    5151            void setConfigValues();
    52             virtual void tick(float dt);
     52            virtual void tick(float dt) override;
    5353
    5454            void requestFocus();
    … …  
    7272            void configvaluecallback_changedNearClipDistance();
    7373
    74             void windowResized(unsigned int newWidth, unsigned int newHeight);
     74            void windowResized(unsigned int newWidth, unsigned int newHeight) override;
    7575
    7676            Ogre::Camera*    camera_;

  • code/branches/cpp11_v2/src/orxonox/graphics/FadingBillboard.h

    r9667 r10817  
    4545            virtual ~FadingBillboard();
    4646
    47             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     47            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4848
    49             virtual void tick(float dt);
    50             virtual void changedActivity();
    51             virtual void changedVisibility();
     49            virtual void tick(float dt) override;
     50            virtual void changedActivity() override;
     51            virtual void changedVisibility() override;
    5252
    5353            inline void setTurnOnTime(float turnontime)
    … …  
    6969            virtual void stopturnonoff();
    7070            virtual void poststopturnonoff();
    71             virtual void changedColour();
     71            virtual void changedColour() override;
    7272
    7373            float turnontime_;

  • code/branches/cpp11_v2/src/orxonox/graphics/GlobalShader.h

    r9667 r10817  
    4444            virtual ~GlobalShader();
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    48             virtual void changedVisibility();
     48            virtual void changedVisibility() override;
    4949
    5050            inline const Shader& getShader() const

  • code/branches/cpp11_v2/src/orxonox/graphics/Light.h

    r9667 r10817  
    5656            virtual ~Light();
    5757
    58             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     58            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5959
    60             virtual void changedVisibility();
     60            virtual void changedVisibility() override;
    6161
    6262            inline Ogre::Light* getLight()
    … …  
    7878                { return this->specular_; }
    7979
    80             virtual void setTeamColour(const ColourValue& colour)
     80            virtual void setTeamColour(const ColourValue& colour) override
    8181                { this->setDiffuseColour(colour); this->setSpecularColour(colour); }
    8282

  • code/branches/cpp11_v2/src/orxonox/graphics/MeshLodInformation.h

    r9667 r10817  
    5050            float getReductionRate(){ return this->reductionRate_; }
    5151
    52             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     52            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5353
    5454        private:

  • code/branches/cpp11_v2/src/orxonox/graphics/Model.h

    r9667 r10817  
    4646            void setConfigValues();
    4747
    48             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     48            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4949
    50             virtual void changedVisibility();
     50            virtual void changedVisibility() override;
    5151
    5252            inline const Mesh& getMesh() const

  • code/branches/cpp11_v2/src/orxonox/graphics/ParticleEmitter.h

    r9950 r10817  
    4343            virtual ~ParticleEmitter();
    4444
    45             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     45            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4646
    47             virtual void changedVisibility();
    48             virtual void changedActivity();
     47            virtual void changedVisibility() override;
     48            virtual void changedActivity() override;
    4949
    5050            inline ParticleInterface* getParticleInterface() const

  • code/branches/cpp11_v2/src/orxonox/graphics/ParticleSpawner.h

    r9667 r10817  
    4343            virtual ~ParticleSpawner();
    4444
    45             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    46             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
     45            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     46            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    4848            inline void stop(bool bDestroy)

  • code/branches/cpp11_v2/src/orxonox/infos/Bot.h

    r9667 r10817  
    4545            void setConfigValues();
    4646
    47             inline bool isInitialized() const
     47            inline bool isInitialized() const override
    4848                { return true; }
    49             inline float getPing() const
     49            inline float getPing() const override
    5050                { return 0; }
    51             inline float getPacketLossRatio() const
     51            inline float getPacketLossRatio() const override
    5252                { return 0; }
    5353

  • code/branches/cpp11_v2/src/orxonox/infos/HumanPlayer.h

    r10624 r10817  
    4545            void setConfigValues();
    4646
    47             bool isInitialized() const;
    48             float getPing() const;
    49             float getPacketLossRatio() const;
     47            bool isInitialized() const override;
     48            float getPing() const override;
     49            float getPacketLossRatio() const override;
    5050
    5151            void setClientID(unsigned int clientID);
    5252
    53             virtual void switchGametype(Gametype* gametype);
     53            virtual void switchGametype(Gametype* gametype) override;
    5454
    5555            inline void setHumanHUDTemplate(const std::string& name)

  • code/branches/cpp11_v2/src/orxonox/infos/PlayerInfo.h

    r10769 r10817  
    4444            virtual ~PlayerInfo();
    4545
    46             virtual void changedName();
     46            virtual void changedName() override;
    4747            virtual void switchGametype(Gametype* gametype);
    4848

  • code/branches/cpp11_v2/src/orxonox/interfaces/PickupCarrier.h

    r10765 r10817  
    7777            PickupCarrier(); //!< Constructor.
    7878            virtual ~PickupCarrier(); //!< Destructor.
    79             void preDestroy(void); //!< Is called before the PickupCarrier is effectively destroyed.
     79            void preDestroy(void) override; //!< Is called before the PickupCarrier is effectively destroyed.
    8080
    8181            bool isTarget(const Pickupable* pickup) const; //!< Can be used to check whether the PickupCarrier or a child of his is a target ot the input Pickupable.

  • code/branches/cpp11_v2/src/orxonox/interfaces/Pickupable.h

    r10624 r10817  
    144144
    145145        protected:
    146             virtual void preDestroy(void); //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
     146            virtual void preDestroy(void) override; //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
    147147            virtual void destroyPickup(void); //!< Destroys a Pickupable.
    148148            virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.
    … …  
    182182        // For implementing the Rewardable interface:
    183183        public:
    184             virtual bool reward(PlayerInfo* player); //!< Method to transcribe a Pickupable as a Rewardable to the player.
     184            virtual bool reward(PlayerInfo* player) override; //!< Method to transcribe a Pickupable as a Rewardable to the player.
    185185
    186186    };

  • code/branches/cpp11_v2/src/orxonox/items/Engine.h

    r10765 r10817  
    5959            virtual ~Engine();
    6060
    61             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     61            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6262            void setConfigValues();
    6363

  • code/branches/cpp11_v2/src/orxonox/items/MultiStateEngine.h

    r9667 r10817  
    5252            virtual ~MultiStateEngine();
    5353
    54             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     54            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5555
    56             virtual void run(float dt);
     56            virtual void run(float dt) override;
    5757
    58             virtual void addToSpaceShip(SpaceShip* ship);
     58            virtual void addToSpaceShip(SpaceShip* ship) override;
    5959
    6060            void addEffectContainer(EffectContainer* effect);

  • code/branches/cpp11_v2/src/orxonox/items/PartDestructionEvent.h

    r10262 r10817  
    100100            virtual ~PartDestructionEvent();
    101101
    102             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     102            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    103103
    104104            void execute();

  • code/branches/cpp11_v2/src/orxonox/items/ShipPart.h

    r10624 r10817  
    4747            virtual ~ShipPart();
    4848
    49             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     49            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5050
    5151            virtual void handleHit(float damage, float healthdamage, float shielddamage, Pawn* originator);

  • code/branches/cpp11_v2/src/orxonox/overlays/GUISheet.h

    r9667 r10817  
    4444        ~GUISheet();
    4545
    46         void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46        void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    4848        void show();

  • code/branches/cpp11_v2/src/orxonox/overlays/InGameConsole.h

    r10624 r10817  
    5353        void setConfigValues();
    5454
    55         void preUpdate(const Clock& time);
    56         void postUpdate(const Clock& time) { /*no action*/ }
     55        void preUpdate(const Clock& time) override;
     56        void postUpdate(const Clock& time) override { /*no action*/ }
    5757
    5858        static void openConsole();
    … …  
    6565        void deactivate();
    6666
    67         void linesChanged();
    68         void lineAdded();
    69         void inputChanged();
    70         void cursorChanged();
    71         void executed();
    72         void exit();
     67        void linesChanged() override;
     68        void lineAdded() override;
     69        void inputChanged() override;
     70        void cursorChanged() override;
     71        void executed() override;
     72        void exit() override;
    7373
    7474        void shiftLines();
    … …  
    7777        void print(const std::string& text, Shell::LineType type, int index, bool alwaysShift = false);
    7878
    79         void windowResized(unsigned int newWidth, unsigned int newHeight);
     79        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
    8080
    8181        // config value related

  • code/branches/cpp11_v2/src/orxonox/overlays/OrxonoxOverlay.h

    r9667 r10817  
    9090        virtual ~OrxonoxOverlay();
    9191
    92         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    93 
    94         virtual void changedName();
     92        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     93
     94        virtual void changedName() override;
    9595
    9696        //! Shows the overlay with an detour to BaseObject::visibility_
    … …  
    167167        void setBackgroundColour(ColourValue colour);
    168168
    169         virtual void changedVisibility();
     169        virtual void changedVisibility() override;
    170170
    171171        inline void setOwner(BaseObject* owner)
    … …  
    206206
    207207    private:
    208         void windowResized(unsigned int newWidth, unsigned int newHeight);
     208        void windowResized(unsigned int newWidth, unsigned int newHeight) override;
    209209
    210210        static unsigned int hudOverlayCounter_s;   //!< Static counter for hud elements

  • code/branches/cpp11_v2/src/orxonox/overlays/OverlayGroup.h

    r10769 r10817  
    5858        ~OverlayGroup();
    5959
    60         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     60        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6161
    6262        static void toggleVisibility(const std::string& name);
    … …  
    6868            { return this->hudElements_; }
    6969
    70         virtual void changedVisibility();
     70        virtual void changedVisibility() override;
    7171
    7272        void setOwner(BaseObject* owner);

  • code/branches/cpp11_v2/src/orxonox/sound/AmbientSound.h

    r9939 r10817  
    5050        AmbientSound();
    5151
    52         void play();
    53         bool stop();
    54         void pause();
     52        void play() override;
     53        bool stop() override;
     54        void pause() override;
    5555
    5656        bool setAmbientSource(const std::string& source);
    … …  
    6666
    6767    private:
    68         void preDestroy();
    69         float getRealVolume();
    70         bool moodChanged(const std::string& mood);
     68        void preDestroy() override;
     69        float getRealVolume() override;
     70        bool moodChanged(const std::string& mood) override;
    7171        inline void ambientSourceChanged()
    7272            { this->setAmbientSource(this->ambientSource_); }

  • code/branches/cpp11_v2/src/orxonox/sound/SoundManager.h

    r10771 r10817  
    6868        ~SoundManager();
    6969
    70         void preUpdate(const Clock& time);
    71         void postUpdate(const Clock& time) { /*no action*/ }
     70        void preUpdate(const Clock& time) override;
     71        void postUpdate(const Clock& time) override { /*no action*/ }
    7272        void setConfigValues();
    7373

  • code/branches/cpp11_v2/src/orxonox/sound/WorldAmbientSound.h

    r9939 r10817  
    5050            virtual ~WorldAmbientSound();
    5151
    52             void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    53             void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
     52            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     53            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
    5454
    55             virtual void changedActivity();
     55            virtual void changedActivity() override;
    5656
    5757            void play();

  • code/branches/cpp11_v2/src/orxonox/sound/WorldSound.h

    r9667 r10817  
    4747        WorldSound(Context* context);
    4848
    49         void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    50         void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
    51         void changedActivity();
     49        void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     50        void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
     51        void changedActivity() override;
    5252
    53         void tick(float dt);
     53        void tick(float dt) override;
    5454
    5555    protected:
    … …  
    5858    private:
    5959        void registerVariables();
    60         void initialiseSource();
    61         float getRealVolume();
     60        void initialiseSource() override;
     61        float getRealVolume() override;
    6262    };
    6363}

  • code/branches/cpp11_v2/src/orxonox/weaponsystem/DefaultWeaponmodeLink.h

    r9667 r10817  
    4242            virtual ~DefaultWeaponmodeLink();
    4343
    44             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     44            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4545
    4646            inline void setFiremode(const unsigned int firemode)

  • code/branches/cpp11_v2/src/orxonox/weaponsystem/Weapon.h

    r10650 r10817  
    5050            virtual ~Weapon();
    5151
    52             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     52            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5353
    5454            void fire(unsigned int mode);

  • code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponMode.h

    r10650 r10817  
    5151            virtual ~WeaponMode();
    5252
    53             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     53            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    5454
    5555            bool fire(float* reloadTime);

  • code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponPack.h

    r9667 r10817  
    4444            virtual ~WeaponPack();
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    4848            void fire(unsigned int weaponmode);

  • code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSet.h

    r9667 r10817  
    4444            virtual ~WeaponSet();
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    4848            void fire();

  • code/branches/cpp11_v2/src/orxonox/weaponsystem/WeaponSlot.h

    r10768 r10817  
    6262            virtual ~WeaponSlot();
    6363
    64             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     64            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    6565
    6666            void attachWeapon(Weapon * weapon);

  • code/branches/cpp11_v2/src/orxonox/worldentities/CameraPosition.h

    r9667 r10817  
    4141            virtual ~CameraPosition();
    4242
    43             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     43            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4444
    4545            inline void setDrag(bool bDrag)

  • code/branches/cpp11_v2/src/orxonox/worldentities/ControllableEntity.h

    r10769 r10817  
    5454            virtual ~ControllableEntity();
    5555
    56             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    57             virtual void tick(float dt);
     56            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     57            virtual void tick(float dt) override;
    5858            void setConfigValues();
    5959
    … …  
    141141            using MobileEntity::setAngularVelocity;
    142142
    143             void setPosition(const Vector3& position);
    144             void setOrientation(const Quaternion& orientation);
    145             void setVelocity(const Vector3& velocity);
    146             void setAngularVelocity(const Vector3& velocity);
     143            void setPosition(const Vector3& position) override;
     144            void setOrientation(const Quaternion& orientation) override;
     145            void setVelocity(const Vector3& velocity) override;
     146            void setAngularVelocity(const Vector3& velocity) override;
    147147
    148148            inline bool hasLocalController() const
    … …  
    177177
    178178        protected:
    179             virtual void preDestroy();
     179            virtual void preDestroy() override;
    180180
    181181            virtual void setPlayer(PlayerInfo* player); // don't call this directly, use friend class PlayerInfo instead
    … …  
    184184            virtual void startLocalHumanControl();
    185185            virtual void stopLocalHumanControl();
    186             virtual void parentChanged();
     186            virtual void parentChanged() override;
    187187
    188188            inline void setHudTemplate(const std::string& name)
    … …  
    214214
    215215            // Bullet btMotionState related
    216             void setWorldTransform(const btTransform& worldTrans);
     216            void setWorldTransform(const btTransform& worldTrans) override;
    217217
    218218            unsigned int server_overwrite_;

  • code/branches/cpp11_v2/src/orxonox/worldentities/Drone.h

    r9667 r10817  
    5050            virtual ~Drone();
    5151
    52             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Drone through XML.
    53             virtual void tick(float dt); //!< Defines which actions the Drone has to take in each tick.
     52            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; //!< Method for creating a Drone through XML.
     53            virtual void tick(float dt) override; //!< Defines which actions the Drone has to take in each tick.
    5454
    5555
    56             virtual void moveFrontBack(const Vector2& value);
    57             virtual void moveRightLeft(const Vector2& value);
    58             virtual void moveUpDown(const Vector2& value);
     56            virtual void moveFrontBack(const Vector2& value) override;
     57            virtual void moveRightLeft(const Vector2& value) override;
     58            virtual void moveUpDown(const Vector2& value) override;
    5959
    60             virtual void rotateYaw(const Vector2& value);
    61             virtual void rotatePitch(const Vector2& value);
    62             virtual void rotateRoll(const Vector2& value);
     60            virtual void rotateYaw(const Vector2& value) override;
     61            virtual void rotatePitch(const Vector2& value) override;
     62            virtual void rotateRoll(const Vector2& value) override;
    6363
    6464            /**

  • code/branches/cpp11_v2/src/orxonox/worldentities/EffectContainer.h

    r9667 r10817  
    4343            virtual ~EffectContainer();
    4444
    45             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     45            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4646
    4747            void setLuaState(LuaState* state, const std::string& functionName);

  • code/branches/cpp11_v2/src/orxonox/worldentities/ExplosionChunk.h

    r9667 r10817  
    4343            virtual ~ExplosionChunk();
    4444
    45             virtual void tick(float dt);
     45            virtual void tick(float dt) override;
    4646
    4747            inline void setLOD(LODParticle::Value level)

  • code/branches/cpp11_v2/src/orxonox/worldentities/MobileEntity.h

    r10437 r10817  
    5555            virtual ~MobileEntity();
    5656
    57             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    58             virtual void tick(float dt);
     57            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     58            virtual void tick(float dt) override;
    5959
    60             virtual void setPosition(const Vector3& position);
    61             virtual void setOrientation(const Quaternion& orientation);
     60            virtual void setPosition(const Vector3& position) override;
     61            virtual void setOrientation(const Quaternion& orientation) override;
    6262
    6363            virtual void setVelocity(const Vector3& velocity);
    6464            inline void setVelocity(float x, float y, float z)
    6565                { this->setVelocity(Vector3(x, y, z)); }
    66             inline const Vector3& getVelocity() const
     66            inline const Vector3& getVelocity() const override
    6767                { return this->linearVelocity_; }
    6868            /**
    … …  
    108108        protected:
    109109            // Bullet btMotionState related
    110             virtual void setWorldTransform(const btTransform& worldTrans);
    111             void getWorldTransform(btTransform& worldTrans) const;
     110            virtual void setWorldTransform(const btTransform& worldTrans) override;
     111            void getWorldTransform(btTransform& worldTrans) const override;
    112112
    113113            Vector3 linearAcceleration_;
    … …  
    117117
    118118        private:
    119             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
     119            virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const override;
    120120    };
    121121}

  • code/branches/cpp11_v2/src/orxonox/worldentities/MovableEntity.h

    r10216 r10817  
    4646            virtual ~MovableEntity();
    4747
    48             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    49             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint);
     48            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     49            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* cs, btManifoldPoint& contactPoint) override;
    5050
    5151            using WorldEntity::setPosition;
    5252            using WorldEntity::setOrientation;
    5353
    54             inline void setPosition(const Vector3& position)
     54            inline void setPosition(const Vector3& position) override
    5555                { MobileEntity::setPosition(position); this->overwrite_position_ = this->getPosition(); }
    56             inline void setOrientation(const Quaternion& orientation)
     56            inline void setOrientation(const Quaternion& orientation) override
    5757                { MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); }
    5858
    … …  
    7979        private:
    8080            void registerVariables();
    81             void clientConnected(unsigned int clientID);
    82             void clientDisconnected(unsigned int clientID);
     81            void clientConnected(unsigned int clientID) override;
     82            void clientDisconnected(unsigned int clientID) override;
    8383            void resynchronize();
    8484

  • code/branches/cpp11_v2/src/orxonox/worldentities/SpawnPoint.h

    r9667 r10817  
    4444            virtual ~SpawnPoint() {}
    4545
    46             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     46            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4747
    4848            inline void setSpawnClass(Identifier* identifier)

  • code/branches/cpp11_v2/src/orxonox/worldentities/StaticEntity.h

    r10437 r10817  
    5555            using WorldEntity::setOrientation;
    5656
    57             void setPosition(const Vector3& position);
    58             void setOrientation(const Quaternion& orientation);
     57            void setPosition(const Vector3& position) override;
     58            void setOrientation(const Quaternion& orientation) override;
    5959
    6060        private:
    6161            void registerVariables();
    62             bool isCollisionTypeLegal(CollisionType type) const;
     62            bool isCollisionTypeLegal(CollisionType type) const override;
    6363
    6464            // network callbacks
    … …  
    6969
    7070            // Bullet btMotionState related
    71             void setWorldTransform(const btTransform& worldTrans);
    72             void getWorldTransform(btTransform& worldTrans) const;
     71            void setWorldTransform(const btTransform& worldTrans) override;
     72            void getWorldTransform(btTransform& worldTrans) const override;
    7373    };
    7474}

  • code/branches/cpp11_v2/src/orxonox/worldentities/TeamSpawnPoint.h

    r9667 r10817  
    4343            virtual ~TeamSpawnPoint() {}
    4444
    45             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     45            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    4646
    4747            void setTeamNumber(unsigned int team)

  • code/branches/cpp11_v2/src/orxonox/worldentities/WorldEntity.h

    r10726 r10817  
    9696            virtual ~WorldEntity();
    9797
    98             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     98            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
    9999
    100100            inline const Ogre::SceneNode* getNode() const
    … …  
    108108            static const Vector3 UP;
    109109
    110             virtual void changedActivity(void);
    111             virtual void changedVisibility(void);
     110            virtual void changedActivity(void) override;
     111            virtual void changedVisibility(void) override;
    112112
    113113            virtual void setPosition(const Vector3& position) = 0;

  • code/branches/cpp11_v2/src/orxonox/worldentities/pawns/Pawn.h

    r10768 r10817  
    6161            virtual ~Pawn();
    6262
    63             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    64             virtual void tick(float dt);
     63            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
     64            virtual void tick(float dt) override;
    6565
    6666            inline bool isAlive() const
    … …  
    143143            virtual void kill();
    144144
    145             virtual void fired(unsigned int firemode);
    146             virtual void reload();
     145            virtual void fired(unsigned int firemode) override;
     146            virtual void reload() override;
    147147            virtual void postSpawn();
    148148
    … …  
    179179
    180180
    181             virtual void startLocalHumanControl();
     181            virtual void startLocalHumanControl() override;
    182182
    183183            void setAimPosition( Vector3 position )
    … …  
    186186                { return this->aimPosition_; }
    187187
    188             virtual const Vector3& getCarrierPosition(void) const
     188            virtual const Vector3& getCarrierPosition(void) const override
    189189                { return this->getWorldPosition(); };
    190190
    191             virtual void changedVisibility();
     191            virtual void changedVisibility() override;
    192192
    193193            void setExplosionSound(const std::string& engineSound);
    … …  
    195195
    196196        protected:
    197             virtual void preDestroy();
    198 
    199             virtual void setPlayer(PlayerInfo* player);
    200             virtual void removePlayer();
     197            virtual void preDestroy() override;
     198
     199            virtual void setPlayer(PlayerInfo* player) override;
     200            virtual void removePlayer() override;
    201201
    202202            virtual void death();
    … …  
    212212            bool bAlive_;
    213213
    214             virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const
     214            virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const override
    215215                { return new std::vector<PickupCarrier*>(); }
    216             virtual PickupCarrier* getCarrierParent(void) const
     216            virtual PickupCarrier* getCarrierParent(void) const override
    217217                { return nullptr; }
    218218
Note: See TracChangeset for help on using the changeset viewer.