Changeset 12347 for code/branches/OrxoBlox_FS19/src

Timestamp:

May 9, 2019, 11:39:39 AM (6 years ago)

Author:

ahuwyler

Message:

LevelUp!

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBloxBall.cc (modified) (2 diffs)
• OrxoBloxBall.h (modified) (1 diff)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc

@@ -33 +33 @@
 
 #include "OrxoBloxBall.h"
+#include "OrxoBlox.h"
 #include <bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
@@ -43 +44 @@
 #include "sound/WorldSound.h"
 #include "core/XMLPort.h"
+
 
 namespace orxonox

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h

@@ -151 +151 @@
             WorldSound* defBoundarySound_;
             OrxoBlox* orxoblox_;
+            OrxoBlox* getOrxoBlox();
     };
 }