Changeset 10261 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Jan 17, 2007, 4:14:41 PM (18 years ago)

Author:

marcscha

Message:

Fixes and cleanups

Location:

branches/playability/src/world_entities/weapons

Files:

• heavy_blaster.cc (modified) (2 diffs)
• light_blaster.cc (modified) (2 diffs)

branches/playability/src/world_entities/weapons/heavy_blaster.cc

@@ -37 +37 @@
   for (int i = 0; i < this->getBarrels(); i++)
   {
+   delete [] this->shootAnim[i];
+   delete [] this->objComp[i];
+  }
+  delete [] this->emissionPoint;
+  
+   delete [] this->shootAnim;
+   delete [] this->objComp;
+/*
     for(int j = 0; j < this->getSegs(); j++)
     {
@@ -45 +53 @@
     delete this->objComp[i];
     delete this->emissionPoint[i];
-  }
-
-//   this->deconstr();
+  }*/
+
+//  this->deconstr();
      // model will be deleted from WorldEntity-destructor
 }

branches/playability/src/world_entities/weapons/light_blaster.cc

@@ -34 +34 @@
 LightBlaster::~LightBlaster()
 {
+
   for (int i = 0; i < this->getBarrels(); i++)
   {
+   delete [] this->shootAnim[i];
+   delete [] this->objComp[i];
+  }
+  delete [] this->emissionPoint;
+   delete [] this->shootAnim;
+   delete [] this->objComp;
+/*
     for(int j = 0; j < this->getSegs(); j++)
     {
@@ -44 +52 @@
     delete this->objComp[i];
     delete this->emissionPoint[i];
-  }
+  }*/
 
-  this->deconstr();
+//  this->deconstr();
       // model will be deleted from WorldEntity-destructor
 }