[Orxonox-commit 7754] r12347 - code/branches/OrxoBlox_FS19/src/modules/OrxoBlox
ahuwyler at orxonox.net
ahuwyler at orxonox.net
Thu May 9 11:39:39 CEST 2019
Author: ahuwyler
Date: 2019-05-09 11:39:39 +0200 (Thu, 09 May 2019)
New Revision: 12347
Modified:
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h
Log:
LevelUp!
Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc 2019-05-09 09:36:28 UTC (rev 12346)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc 2019-05-09 09:39:39 UTC (rev 12347)
@@ -32,6 +32,7 @@
*/
#include "OrxoBloxBall.h"
+#include "OrxoBlox.h"
#include <bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
#include "core/CoreIncludes.h"
@@ -43,6 +44,7 @@
#include "sound/WorldSound.h"
#include "core/XMLPort.h"
+
namespace orxonox
{
RegisterClass(OrxoBloxBall);
Modified: code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h
===================================================================
--- code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h 2019-05-09 09:36:28 UTC (rev 12346)
+++ code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h 2019-05-09 09:39:39 UTC (rev 12347)
@@ -150,6 +150,7 @@
WorldSound* defBatSound_;
WorldSound* defBoundarySound_;
OrxoBlox* orxoblox_;
+ OrxoBlox* getOrxoBlox();
};
}
More information about the Orxonox-commit
mailing list