Changeset 11735 for code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc

Timestamp:

Feb 11, 2018, 7:19:57 PM (6 years ago)

Author:

landauf

Message:

[AsteroidMining_HS17] fixed a bunch of memory leaks

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc (modified) (2 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroidmining/AsteroidMinable.cc

@@ -177 +177 @@
         reborn->setVelocity(this->getVelocity());
         // reborn->setAngularVelocity(this->getAngularVelocity()); // Add all other stuff, too?
-        (void)reborn; // avoid compiler warning
 
         this->bAlive_ = false;
@@ -361 +360 @@
     for(int fisch = 0; fisch<num; ++fisch){
 
-        Vector3* pos = new Vector3(0,0,0); // Position offset
+        Vector3 pos = Vector3::ZERO; // Position offset
         if(num > 1){// not required if there-s just one child
             float r = masses[fisch]/rScaling;
-            pos = new Vector3(r*sin(theta[fisch])*cos(phi[fisch]), r*sin(theta[fisch])*sin(phi[fisch]), r*cos(theta[fisch])); // convert spheric coordinates to vector
+            pos = Vector3(r*sin(theta[fisch])*cos(phi[fisch]), r*sin(theta[fisch])*sin(phi[fisch]), r*cos(theta[fisch])); // convert spheric coordinates to vector
         }
         
-        AsteroidMinable* child = new AsteroidMinable(this->context, masses[fisch], this->getPosition() + *pos, this->dropStuff);
+        AsteroidMinable* child = new AsteroidMinable(this->context, masses[fisch], this->getPosition() + pos, this->dropStuff);
         child->setVelocity(this->getVelocity());
-
-        if(child == nullptr){
-            orxout(internal_error, context::pickups) << "Weird, can't create new AsteroidMinable." << endl;
-        }
 
     }