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

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/overlays/hud

Files:

• AnnounceMessage.h (modified) (1 diff)
• DeathMessage.h (modified) (1 diff)
• GametypeFadingMessage.h (modified) (1 diff)
• GametypeStaticMessage.h (modified) (1 diff)
• HUDEnemyHealthBar.h (modified) (1 diff)
• HUDNavigation.h (modified) (1 diff)
• HUDRadar.h (modified) (2 diffs)
• KillMessage.h (modified) (1 diff)

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: