Changeset 9918 for code/branches/presentationHS13/src/modules/pong/PongBall.h

Timestamp:

Dec 16, 2013, 3:43:45 PM (10 years ago)

Author:

smerkli

Message:

Merged sfxThilo branch, things seem to be working fine

Location:

code/branches/presentationHS13

Files:

• . (modified) (1 prop)
• src/modules/pong/PongBall.h (modified) (4 diffs)

code/branches/presentationHS13/src/modules/pong/PongBall.h

@@ -42 +42 @@
 #include "worldentities/MovableEntity.h"
 
+
 namespace orxonox
 {
@@ -63 +64 @@
 
             virtual void tick(float dt);
+
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
             /**
@@ -123 +126 @@
             static const float MAX_REL_Z_VELOCITY;
 
+            void setDefScoreSound(const std::string& engineSound);
+            const std::string& getDefScoreSound();
+            void setDefBatSound(const std::string& engineSound);
+            const std::string& getDefBatSound();
+            void setDefBoundarySound(const std::string& engineSound);
+            const std::string& getDefBoundarySound();
+
         private:
             void registerVariables();
@@ -135 +145 @@
             unsigned int* batID_; //!< The object IDs of the bats, to be able to synchronize them over the network.
             float relMercyOffset_; //!< Offset, that makes the player not loose, when, in all fairness, he would have.
+            WorldSound* defScoreSound_;
+            WorldSound* defBatSound_;
+            WorldSound* defBoundarySound_;
     };
 }