Changeset 3888 in orxonox.OLD for orxonox/trunk/src/world_entities/weapon.cc

Timestamp:

Apr 19, 2005, 1:16:16 AM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: deconstructor cleanup in weapon/gun

File:

• orxonox/trunk/src/world_entities/weapon.cc (modified) (3 diffs)

orxonox/trunk/src/world_entities/weapon.cc

@@ -52 +52 @@
   /* 
      i dont have to delete the weapons itself, because they are 
-     worldentities and therefore in the entities list of the world
+     worldentities and therefore in the entities list of the world.
+     world will clean them up for me
   */
   for(int i = 0; i < W_MAX_CONFIGS; ++i)
@@ -207 +208 @@
   WorldInterface* wi = WorldInterface::getInstance();
   this->worldEntities = wi->getEntityList();
+
+  this->objectComponent1 = NULL;
+  this->objectComponent2 = NULL;
+  this->objectComponent3 = NULL;
+
+  this->animation1 = NULL;
+  this->animation2 = NULL;
+  this->animation3 = NULL;
 }
 
@@ -216 +225 @@
 {
   // model will be deleted from WorldEntity-destructor
+  //this->worldEntities = NULL;
+  
+  /* dont delete objectComponentsX here, they will be killed when the pnodes are cleaned out */
+
+  /* all animations are deleted via the animation player*/
 }