Changeset 6725 for code/trunk/src/orxonox/interfaces

Timestamp:

Apr 13, 2010, 10:39:54 PM (15 years ago)

Author:

dafrick

Message:

Resolved bug, that caused orxonox to crash whenever a level with pickups was loaded twice in one session.
Also some more debug/info output, commenting and cleanup.

File:

• code/trunk/src/orxonox/interfaces/Pickupable.cc (modified) (2 diffs)

code/trunk/src/orxonox/interfaces/Pickupable.cc

@@ -46 +46 @@
         Constructor. Registers the objects and initializes its member variables.
     */
-    Pickupable::Pickupable() : used_(false), pickedUp_(false)
+    Pickupable::Pickupable() : pickupIdentifier_(NULL), used_(false), pickedUp_(false)
     {        
         RegisterRootObject(Pickupable);
@@ -69 +69 @@
             this->setCarrier(NULL);
         }
+        
+        if(this->pickupIdentifier_ != NULL)
+            this->pickupIdentifier_->destroy();
     }