Changeset 10845 for code/branches/cpp11_v2/src/modules

Timestamp:

Nov 23, 2015, 10:20:29 PM (9 years ago)

Author:

landauf

Message:

always use 'virtual' in the declaration of virtual functions even if they are inherited

Location:

code/branches/cpp11_v2/src/modules

Files:

• designtools/CreateStars.h (modified) (1 diff)
• designtools/SkyboxGenerator.h (modified) (1 diff)
• gametypes/OldRaceCheckPoint.h (modified) (1 diff)
• gametypes/RaceCheckPoint.h (modified) (1 diff)
• gametypes/SpaceRace.h (modified) (2 diffs)
• gametypes/SpaceRaceManager.h (modified) (2 diffs)
• objects/Attacher.h (modified) (1 diff)
• objects/SpaceBoundaries.h (modified) (1 diff)
• overlays/hud/AnnounceMessage.h (modified) (1 diff)
• overlays/hud/DeathMessage.h (modified) (1 diff)
• overlays/hud/GametypeFadingMessage.h (modified) (1 diff)
• overlays/hud/GametypeStaticMessage.h (modified) (1 diff)
• overlays/hud/HUDEnemyHealthBar.h (modified) (1 diff)
• overlays/hud/HUDNavigation.h (modified) (1 diff)
• overlays/hud/HUDRadar.h (modified) (2 diffs)
• overlays/hud/KillMessage.h (modified) (1 diff)
• portals/PortalEndPoint.h (modified) (1 diff)

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

@@ -43 +43 @@
             void createBillboards();
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void setNumStars(int num) {

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

@@ -65 +65 @@
             SkyboxGenerator();
             virtual ~SkyboxGenerator();
-            void tick(float dt) override; // This is where the skybox generation happens.
+            virtual void tick(float dt) override; // This is where the skybox generation happens.
             static void createSkybox(void); // Generate the 6 faces of a skybox.
             void setConfigValues(void); // Sets some config values.

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

@@ -64 +64 @@
             inline float getTimeLimit()
                 { return this->bTimeLimit_;}
-            inline const WorldEntity* getWorldEntity() const override
+            virtual inline const WorldEntity* getWorldEntity() const override
                 { return this; }
 

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

@@ -94 +94 @@
             virtual void fire(bool bIsTriggered, BaseObject* originator) override;
 
-            inline const WorldEntity* getWorldEntity() const override
+            virtual inline const WorldEntity* getWorldEntity() const override
             {
                 return this;

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

@@ -57 +57 @@
             virtual ~SpaceRace() {}
 
-            void tick(float dt) override;
+            virtual void tick(float dt) override;
 
             virtual void end() override;
@@ -70 +70 @@
                 { return this->clock_; }
 
-            bool allowPawnHit(Pawn* victim, Pawn* originator) override;
-            bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
-            bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
+            virtual bool allowPawnHit(Pawn* victim, Pawn* originator) override;
+            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
+            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
 
         private:

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

@@ -58 +58 @@
             virtual ~SpaceRaceManager() ;
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
             void addCheckpoint(RaceCheckPoint* checkpoint);
@@ -69 +69 @@
             std::vector<RaceCheckPoint*> getAllCheckpoints();
 
-            void tick(float dt) override;
+            virtual void tick(float dt) override;
 
         protected:

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

@@ -64 +64 @@
                 { return this->targetname_; }
 
-            void loadedNewXMLName(BaseObject* object) override;
+            virtual void loadedNewXMLName(BaseObject* object) override;
 
         private:

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

@@ -93 +93 @@
             int getReaction();
 
-            void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-            void tick(float dt) override;
+            virtual void tick(float dt) override;
 
         private:

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

@@ -45 +45 @@
             virtual void changedOwner() override;
 
-            void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
+            virtual void announcemessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:

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

@@ -45 +45 @@
             virtual void changedOwner() override;
 
-            void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
+            virtual void deathmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:

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

@@ -45 +45 @@
             virtual void changedOwner() override;
 
-            void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
+            virtual void fadingmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:

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

@@ -48 +48 @@
             virtual void changedOwner() override;
 
-            void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
+            virtual void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour) override;
 
         private:

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

@@ -43 +43 @@
             virtual void tick(float dt) override;
 
-            void changedOwner() override;
+            virtual void changedOwner() override;
 
         private:

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

@@ -65 +65 @@
             virtual void radarTick(float dt) override {}
 
-            inline float getRadarSensitivity() const override
+            virtual inline float getRadarSensitivity() const override
                 { return 1.0f; }
 

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

@@ -80 +80 @@
         void set3DMaterialBack(std::string material3DBack) { this->material3DBack_ = material3DBack; }
 
-        float getRadarSensitivity() const override { return this->sensitivity_; }
+        virtual float getRadarSensitivity() const override { return this->sensitivity_; }
         // used also by RadarListener interface!
         void setRadarSensitivity(float sensitivity) { this->sensitivity_ = sensitivity; }
@@ -92 +92 @@
         virtual void removeObject(RadarViewable* viewable) override;
         virtual void objectChanged( RadarViewable* rv ) override;
-        void radarTick(float dt) override;
+        virtual void radarTick(float dt) override;
         bool showObject( RadarViewable* rv ); //!< Do not display an object on radar, if showObject(.) is false.
 

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

@@ -45 +45 @@
             virtual void changedOwner() override;
 
-            void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
+            virtual void killmessage(const GametypeInfo* gtinfo, const std::string& message) override;
 
         private:

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

@@ -69 +69 @@
                 { this->trigger_->addTarget(target); }
 
-            void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
             static std::map<unsigned int, PortalEndPoint *> idMap_s; //!< Maps the id of each PortalEndPoint to a pointer to that PortalEndPoint
             inline void setReenterDelay(unsigned int seconds)