Changeset 9571 for code/branches/core6/src/orxonox/interfaces

Timestamp:

Mar 24, 2013, 9:03:22 PM (12 years ago)

Author:

landauf

Message:

using Destroyable instead of OrxonoxClass now wherever the destruction-related members are addressed

Location:

code/branches/core6/src/orxonox/interfaces

Files:

• Pickupable.cc (modified) (2 diffs)
• Pickupable.h (modified) (1 diff)

code/branches/core6/src/orxonox/interfaces/Pickupable.cc

@@ -71 +71 @@
     /**
     @brief
-        A method that is called by OrxonoxClass::destroy() before the object is actually destroyed.
+        A method that is called by Destroyable::destroy() before the object is actually destroyed.
     */
     void Pickupable::preDestroy(void)
@@ -98 +98 @@
     {
         if(!this->isBeingDestroyed())
-            this->OrxonoxClass::destroy();
+            this->Destroyable::destroy();
         else
             orxout(internal_warning, context::pickups) << this->getIdentifier()->getName() << " may be unsafe. " << endl;

code/branches/core6/src/orxonox/interfaces/Pickupable.h

@@ -144 +144 @@
 
         protected:
-            virtual void preDestroy(void); //!< A method that is called by OrxonoxClass::destroy() before the object is actually destroyed.
+            virtual void preDestroy(void); //!< A method that is called by Destroyable::destroy() before the object is actually destroyed.
             virtual void destroyPickup(void); //!< Destroys a Pickupable.
             virtual void carrierDestroyed(void); //!< Is called by the PickupCarrier when it is being destroyed.