Changeset 5806 for code/branches/core5/src/libraries/core

Timestamp:

Sep 27, 2009, 4:13:13 AM (15 years ago)

Author:

landauf

Message:

• The gametype pointer in BaseObject is now also a SmartPtr
• The GametypeInfo object in Gametype is now a pointer instead of a member object to prevent double free (once deleted by the unloader and once when the gametype gets destroyed)
• GSLevel sets the Gametype of all HumanPlayer objects to 0 because they don't get deleted and would prevent the Gametype from being destroyed.
• Fixed a bug in HumanPlayer when Gametype is set to 0

Unloading seems to work with bots now.

File:

• code/branches/core5/src/libraries/core/BaseObject.h (modified) (3 diffs)

code/branches/core5/src/libraries/core/BaseObject.h

@@ -138 +138 @@
             inline const SmartPtr<Scene>& getScene() const { return this->scene_; }
 
-            inline void setGametype(Gametype* gametype)
+            inline void setGametype(const SmartPtr<Gametype>& gametype)
             {
                 if (gametype != this->gametype_)
@@ -147 +147 @@
                 }
             }
-            inline Gametype* getGametype() const { return this->gametype_; }
+            inline const SmartPtr<Gametype>& getGametype() const { return this->gametype_; }
             inline Gametype* getOldGametype() const { return this->oldGametype_; }
             virtual void changedGametype() {}
@@ -196 +196 @@
             BaseObject*            creator_;
             SmartPtr<Scene>        scene_;
-            Gametype*              gametype_;
+            SmartPtr<Gametype>     gametype_;
             Gametype*              oldGametype_;
             std::set<Template*>    templates_;