Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

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/modules
Files:
148 edited

Legend:

Unmodified
Added
Removed

  • 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)
Note: See TracChangeset for help on using the changeset viewer.