Changeset 12366 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.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/OrxoBloxBall.cc (modified) (7 diffs)

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

@@ -65 +65 @@
         this->speed_ = 0;
         this->accelerationFactor_ = 1.0f;
-        this->bDeleteBats_ = false;
+        
         this->relMercyOffset_ = 0.05f;
         this->orxoblox_ = this->getOrxoBlox();
@@ -77 +77 @@
                  this->defScoreSound_ = new WorldSound(this->getContext());
                  this->defScoreSound_->setVolume(1.0f);
-                 this->defBatSound_ = new WorldSound(this->getContext());
-                 this->defBatSound_->setVolume(0.4f);
+                 
                  this->defBoundarySound_ = new WorldSound(this->getContext());
                  this->defBoundarySound_->setVolume(0.5f);
@@ -85 +84 @@
              {
                  this->defScoreSound_ = nullptr;
-                 this->defBatSound_ = nullptr;
+                 
                  this->defBoundarySound_ = nullptr;
              }
@@ -96 +95 @@
     OrxoBloxBall::~OrxoBloxBall()
     {
-        if (this->isInitialized())
-        {
-            if (this->bDeleteBats_)
-
-            delete[] this->batID_;
-        }
+        
     }
 
@@ -109 +103 @@
         SUPER(OrxoBloxBall, XMLPort, xmlelement, mode);
         XMLPortParam(OrxoBloxBall, "defScoreSound",  setDefScoreSound,  getDefScoreSound,  xmlelement, mode);
-        XMLPortParam(OrxoBloxBall, "defBatSound",  setDefBatSound,  getDefBatSound,  xmlelement, mode);
+        
         XMLPortParam(OrxoBloxBall, "defBoundarySound",  setDefBoundarySound,  getDefBoundarySound,  xmlelement, mode);
     }
@@ -121 +115 @@
         registerVariable( this->fieldWidth_ );
         registerVariable( this->fieldHeight_ );
-        registerVariable( this->batlength_ );
+        
         registerVariable( this->speed_ );
         registerVariable( this->relMercyOffset_ );
@@ -275 +269 @@
     }
 
-    void OrxoBloxBall::setDefBatSound(const std::string &OrxoBloxSound)
-    {
-        if( defBatSound_ )
-            defBatSound_->setSource(OrxoBloxSound);
-        else
-            assert(0); // This should never happen, because soundpointer is only available on master
-    }
-
-    const std::string& OrxoBloxBall::getDefBatSound()
-    {
-        if( defBatSound_ )
-            return defBatSound_->getSource();
-        else
-            assert(0);
-        return BLANKSTRING;
-    }
-
+    
+    
     void OrxoBloxBall::setDefBoundarySound(const std::string &OrxoBloxSound)
     {