Changeset 5805 for code/branches/core5/src/modules/gamestates/GSLevel.cc

Timestamp:

Sep 27, 2009, 2:33:48 AM (15 years ago)

Author:

landauf

Message:

• Enhanced SmartPtr: a) It stores now two pointers, one OrxonoxClass* (for reference counting) and one T* (for normal use). b) Incrementing the reference is now optional in the constructor for raw pointers. This is needed because Scene has a selfreference but should still be destroyable.
• Changed BaseObject to store a SmartPtr to it's Scene instead of a normal pointer.
• Changed setScene and getScene to deal directly with SmartPtr instead of a Scene* pointer to avoid casting-to-OrxonoxClass issues.
• Fixed two problems with lost SceneManagers in CameraManger: a) added a SmartPtr to the Scene for the fallback camera b) added a call to GUIManager in the destructor to release the scene manager
• Enabled unloading in GSLevel again (after years). Works if playing without bots.

File:

• code/branches/core5/src/modules/gamestates/GSLevel.cc (modified) (1 diff)

code/branches/core5/src/modules/gamestates/GSLevel.cc

@@ -242 +242 @@
     void GSLevel::unloadLevel()
     {
-        //////////////////////////////////////////////////////////////////////////////////////////
-        // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO // TODO //
-        //////////////////////////////////////////////////////////////////////////////////////////
-        // Loader::unload(startFile_); // TODO: REACTIVATE THIS IF LOADER::UNLOAD WORKS PROPERLY /
-        //////////////////////////////////////////////////////////////////////////////////////////
+        Loader::unload(startFile_s);
 
         delete startFile_s;