Changeset 11054 for code/branches/cpp11_v3/src/orxonox/sound/WorldSound.h

Timestamp:

Jan 10, 2016, 1:54:11 PM (9 years ago)

Author:

landauf

Message:

merged branch cpp11_v2 into cpp11_v3

Location:

code/branches/cpp11_v3

Files:

• . (modified) (1 prop)
• src/orxonox/sound/WorldSound.h (modified) (2 diffs)

code/branches/cpp11_v3/src/orxonox/sound/WorldSound.h

@@ -47 +47 @@
         WorldSound(Context* context);
 
-        void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-        void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
-        void changedActivity();
+        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override;
+        virtual void changedActivity() override;
 
-        void tick(float dt);
+        virtual void tick(float dt) override;
 
     protected:
@@ -58 +58 @@
     private:
         void registerVariables();
-        void initialiseSource();
-        float getRealVolume();
+        virtual void initialiseSource() override;
+        virtual float getRealVolume() override;
     };
 }