Changeset 12366 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

Timestamp:

May 9, 2019, 5:15:43 PM (5 years ago)

Author:

ahuwyler

Message:

Here and there

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified) (3 diffs)

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

@@ -49 +49 @@
 #include "OrxoBloxCenterpoint.h"
 #include "OrxoBloxBall.h"
-//#include "OrxoBloxBot.h"//Remove??
 #include "OrxoBloxStones.h"
 #include "OrxoBloxWall.h"
@@ -64 +63 @@
         Constructor. Registers and initializes the object.
     */
-    OrxoBlox::OrxoBlox(Context* context) : ::orxonox::Deathmatch::Deathmatch(context)
+    OrxoBlox::OrxoBlox(Context* context) : Deathmatch(context)
     {
         RegisterObject(OrxoBlox);
@@ -147 +146 @@
             this->ball_->setSpeed(0);
             this->ball_->setAccelerationFactor(this->center_->getBallAccelerationFactor());
-            this->ball_->setBatLength(this->center_->getBatLength());
-
+            
             level_=1;