Changeset 3544 in orxonox.OLD for orxonox/trunk/src/story_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/story_entities

Files:

• campaign.h (modified) (1 diff)
• world.cc (modified) (2 diffs)

orxonox/trunk/src/story_entities/campaign.h

@@ -13 +13 @@
  public:
   Campaign ();
-  ~Campaign ();
+  virtual ~Campaign ();
 
   StoryEntity* currentEntity;

orxonox/trunk/src/story_entities/world.cc

@@ -69 +69 @@
   cn->reset();
 
-  this->localCamera->destroy();
-  this->nullParent->destroy();
+  delete this->localCamera;
   delete this->nullParent;
   //delete this->skySphere;
@@ -665 +664 @@
   p4->debug ();
 
-  p1->destroy ();
+  delete p1;