Changeset 5806 for code/branches/core5/src/modules

Timestamp:

Sep 27, 2009, 4:13:13 AM (16 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.

Location:

code/branches/core5/src/modules

Files:

• gamestates/GSLevel.cc (modified) (2 diffs)
• objects/triggers/CheckPoint.cc (modified) (1 diff)
• overlays/hud/TeamBaseMatchScore.cc (modified) (1 diff)
• overlays/hud/UnderAttackHealthBar.cc (modified) (1 diff)
• pong/Pong.cc (modified) (1 diff)
• pong/PongCenterpoint.cc (modified) (1 diff)
• pong/PongScore.cc (modified) (1 diff)

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

@@ -52 +52 @@
 #include "LevelManager.h"
 #include "PlayerManager.h"
+#include "infos/HumanPlayer.h"
 
 namespace orxonox
@@ -242 +243 @@
     void GSLevel::unloadLevel()
     {
+        for (ObjectList<HumanPlayer>::iterator it = ObjectList<HumanPlayer>::begin(); it; ++it)
+            it->setGametype(0);
+        
         Loader::unload(startFile_s);
 

code/branches/core5/src/modules/objects/triggers/CheckPoint.cc

@@ -85 +85 @@
         DistanceTrigger::triggered(bIsTriggered);
 
-        Asteroids* gametype = orxonox_cast<Asteroids*>(this->getGametype());
+        Asteroids* gametype = orxonox_cast<Asteroids*>(this->getGametype().get());
         if (gametype)
         {

code/branches/core5/src/modules/overlays/hud/TeamBaseMatchScore.cc

@@ -118 +118 @@
 
         if (this->getOwner() && this->getOwner()->getGametype())
-            this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype());
+            this->owner_ = orxonox_cast<TeamBaseMatch*>(this->getOwner()->getGametype().get());
         else
             this->owner_ = 0;

code/branches/core5/src/modules/overlays/hud/UnderAttackHealthBar.cc

@@ -78 +78 @@
             this->owner_ = player;
 
-            UnderAttack* ua = orxonox_cast<UnderAttack*>(player->getGametype());
+            UnderAttack* ua = orxonox_cast<UnderAttack*>(player->getGametype().get());
             if (ua)
             {

code/branches/core5/src/modules/pong/Pong.cc

@@ -158 +158 @@
 
             if (player)
-                this->gtinfo_.sendAnnounceMessage(player->getName() + " scored");
+                this->gtinfo_->sendAnnounceMessage(player->getName() + " scored");
         }
 

code/branches/core5/src/modules/pong/PongCenterpoint.cc

@@ -73 +73 @@
         if (this->getGametype() && this->getGametype()->isA(Class(Pong)))
         {
-            Pong* pong_gametype = orxonox_cast<Pong*>(this->getGametype());
+            Pong* pong_gametype = orxonox_cast<Pong*>(this->getGametype().get());
             pong_gametype->setCenterpoint(this);
         }

code/branches/core5/src/modules/pong/PongScore.cc

@@ -133 +133 @@
 
         if (this->getOwner() && this->getOwner()->getGametype())
-            this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype());
+            this->owner_ = orxonox_cast<Pong*>(this->getOwner()->getGametype().get());
         else
             this->owner_ = 0;