Changeset 7126 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 13, 2006, 1:14:53 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: the delete Mechanism of PNode seems to work again.
This is done by always deleting the first node, and not walking through a list, that is eleminated during deletion time

Location:

trunk/src/world_entities

Files:

• environments/water.cc (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (2 diffs)

trunk/src/world_entities/environments/water.cc

@@ -63 +63 @@
 Water::~Water()
 {
-  delete this->grid;
 }
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -80 +80 @@
   Weapon* wpLeft = new TestGun(1);
   wpLeft->setName("testGun Left");
-  Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
-
-  cannon->setName("BFG");
+  //Weapon* cannon = dynamic_cast<Weapon*>(Factory::fabricate(CL_HYPERBLASTER));
+
+  //  cannon->setName("BFG");
 
   this->addWeapon(wpLeft, 1, 0);
   this->addWeapon(wpRight,1 ,1);
-  this->addWeapon(cannon, 0, 2);
+  //this->addWeapon(cannon, 0, 2);
 
   this->getWeaponManager()->changeWeaponConfig(1);

trunk/src/world_entities/weapons/weapon.cc

@@ -29 +29 @@
 #include "state.h"
 #include "animation3d.h"
-#include "vector.h"
 
 #include "sound_source.h"
@@ -86 +85 @@
   this->soundSource = new SoundSource(this);       //< Every Weapon has exacty one SoundSource.
   this->emissionPoint.setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
+  this->emissionPoint.setName("EmissionPoint");
+  this->emissionPoint.addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
 
   this->defaultTarget = NULL;                      //< Nothing is Targeted by default.