Changeset 12308 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.cc

Timestamp:

Apr 18, 2019, 3:44:09 PM (5 years ago)

Author:

ahuwyler

Message:

Bats are gone

File:

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

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

@@ -39 +39 @@
 #include "gametypes/Gametype.h"
 
-#include "OrxoBloxBat.h"
 
 #include "sound/WorldSound.h"
@@ -61 +60 @@
         this->speed_ = 0;
         this->accelerationFactor_ = 1.0f;
-        this->bat_ = nullptr;
         this->bDeleteBats_ = false;
-        this->batID_ = new unsigned int[2];
-        this->batID_[0] = OBJECTID_UNKNOWN;
-        this->batID_[1] = OBJECTID_UNKNOWN;
         this->relMercyOffset_ = 0.05f;
 
@@ -97 +92 @@
         {
             if (this->bDeleteBats_)
-                delete[] this->bat_;
 
             delete[] this->batID_;
@@ -123 +117 @@
         registerVariable( this->speed_ );
         registerVariable( this->relMercyOffset_ );
-        registerVariable( this->batID_[0] );
-        registerVariable( this->batID_[1], VariableDirection::ToClient, new NetworkCallback<OrxoBloxBall>( this, &OrxoBloxBall::applyBats) );
     }
 
@@ -217 +209 @@
     }
 
-    /**
-    @brief
-        Set the bats for the ball.
-    @param bats
-        An array (of size 2) of weak pointers, to be set as the new bats.
-    */
-    void OrxoBloxBall::setBats(WeakPtr<OrxoBloxBat>* bats)
-    {
-        if (this->bDeleteBats_) // If there are already some bats, delete them.
-        {
-            delete[] this->bat_;
-            this->bDeleteBats_ = false;
-        }
-
-        this->bat_ = bats;
-        // Also store their object IDs, for synchronization.
-        this->batID_[0] = this->bat_[0]->getObjectID();
-        this->batID_[1] = this->bat_[1]->getObjectID();
-    }
-
-    /**
-    @brief
-        Get the bats over the network.
-    */
-    void OrxoBloxBall::applyBats()
-    {
-        // Make space for the bats, if they don't exist, yet.
-        if (this->bat_ == nullptr)
-        {
-            this->bat_ = new WeakPtr<OrxoBloxBat>[2];
-            this->bDeleteBats_ = true;
-        }
-
-        if (this->batID_[0] != OBJECTID_UNKNOWN)
-            this->bat_[0] = orxonox_cast<OrxoBloxBat*>(Synchronisable::getSynchronisable(this->batID_[0]));
-        if (this->batID_[1] != OBJECTID_UNKNOWN)
-            this->bat_[1] = orxonox_cast<OrxoBloxBat*>(Synchronisable::getSynchronisable(this->batID_[1]));
-    }
 
     void OrxoBloxBall::setDefScoreSound(const std::string &OrxoBloxSound)