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

Timestamp:

Mar 14, 2005, 10:54:00 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now the delete-process is as inteded by c++
virtual ~ClassName extends deletion and deletes also the MasterClass

Location:

orxonox/trunk/src/world_entities

Files:

• environment.h (modified) (1 diff)
• npc.h (modified) (1 diff)
• player.cc (modified) (1 diff)
• player.h (modified) (1 diff)
• power_up.h (modified) (1 diff)
• primitive.cc (modified) (1 diff)
• primitive.h (modified) (1 diff)
• skysphere.cc (modified) (1 diff)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (1 diff)

orxonox/trunk/src/world_entities/environment.h

@@ -18 +18 @@
  public:
   Environment ();
-  ~Environment ();
+  virtual ~Environment ();
 
   

orxonox/trunk/src/world_entities/npc.h

@@ -12 +12 @@
   NPC ();
   ~NPC ();
-  void destroy(void);
 
   /* collision control */

orxonox/trunk/src/world_entities/player.cc

@@ -33 +33 @@
 
 /**
-   \brief destructs the player
+   \brief destructs the player, deletes alocated memory
 */
 Player::~Player ()
 {
-  this->destroy();
-}
-
-/**
-   \brief deletes all allocated memory of the Player
-*/
-void Player::destroy ()
-{
   delete this->model;
-
-  static_cast<WorldEntity*>(this)->destroy();
 }
 

orxonox/trunk/src/world_entities/player.h

@@ -19 +19 @@
   Player(bool isFree = false);
   virtual ~Player();
-  void destroy();
   
   virtual void postSpawn();

orxonox/trunk/src/world_entities/power_up.h

@@ -15 +15 @@
  public:
   PowerUp ();
-  ~PowerUp ();
+  virtual ~PowerUp ();
   
 };

orxonox/trunk/src/world_entities/primitive.cc

@@ -39 +39 @@
 }
 
-void Primitive::destroy () 
-{
-
-
-  static_cast<WorldEntity*>(this)->destroy();
-}
-
-
 void Primitive::tick (float time) 
 {

orxonox/trunk/src/world_entities/primitive.h

@@ -13 +13 @@
   Primitive (PRIMITIVE_FORM form);
   virtual ~Primitive ();
-  void destroy(void);
 
   virtual void tick (float time);

orxonox/trunk/src/world_entities/skysphere.cc

@@ -57 +57 @@
 Skysphere::~Skysphere()
 {
-  this->destroy();
-}
-
-void Skysphere::destroy(void)
-{
-
   PRINTF(3)("Deleting the SkySphere\n");
-  delete skyMaterial;
-  free(sphereObj);
-  
-  static_cast<WorldEntity*>(this)->destroy();
+  delete this->skyMaterial;
+  free(this->sphereObj);
 }
 

orxonox/trunk/src/world_entities/world_entity.cc

@@ -47 +47 @@
 {
   // if( collisioncluster != NULL) delete collisioncluster;
-  this->destroy();
-}
-
-/**
-   \brief Function to call if a WorldEntity is destroyed. deletes all alocated memory.
-   */
-void WorldEntity::destroy() 
-{
-
-  // delete everything of pNode.
-  static_cast<PNode*>(this)->destroy();
-}
-
+
+}
 
 /**

orxonox/trunk/src/world_entities/world_entity.h

@@ -21 +21 @@
   WorldEntity (bool isFree = false);
   virtual ~WorldEntity ();
-  void destroy ();