Changeset 9944

Timestamp:

Jan 3, 2014, 1:29:33 PM (11 years ago)

Author:

landauf

Message:

no Thilo, we don't want to call preDestroy()
made documentation of destroy() and preDestroy() more explicit.

Location:

code/trunk/src

Files:

• libraries/core/object/Destroyable.cc (modified) (1 diff)
• libraries/core/object/Destroyable.h (modified) (1 diff)
• orxonox/gamestates/GSMainMenu.cc (modified) (1 diff)

code/trunk/src/libraries/core/object/Destroyable.cc

@@ -61 +61 @@
     /**
         @brief Deletes the object if no @ref orxonox::SmartPtr "smart pointers" point to this object. Otherwise schedules the object to be deleted as soon as possible.
+        Always call destroy() instead of using 'delete' directly, otherwise smart pointers won't work.
     */
     void Destroyable::destroy()

code/trunk/src/libraries/core/object/Destroyable.h

@@ -63 +63 @@
 
         protected:
-            /// This virtual function is called if destroy() is called and no SmartPtr points to this object. Used in some cases to create a new SmartPtr to prevent destruction.
+            /// This virtual function is called if destroy() is called and no SmartPtr points to this object. Used in some cases to create a new SmartPtr to
+            /// prevent destruction. Don't call this function directly - use destroy() instead.
             virtual void preDestroy() {}
 

code/trunk/src/orxonox/gamestates/GSMainMenu.cc

@@ -85 +85 @@
     {
         if (GameMode::playsSound())
-            this->ambient_->destroy(); //CHECK Thilo destroy ?preDestroy()? !!!!!!!
+            this->ambient_->destroy();
 
         InputManager::getInstance().destroyState("MainMenuHackery");