Changeset 5806 for code/branches/core5/src/orxonox/gametypes/Asteroids.cc

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/orxonox/gametypes/Asteroids.cc (modified) (2 diffs)

code/branches/core5/src/orxonox/gametypes/Asteroids.cc

@@ -54 +54 @@
         if (this->time_ < 0 && !this->hasEnded() && this->timerIsActive_)
         {
-            this->gtinfo_.sendAnnounceMessage("Time's up - you have lost the match!");
+            this->gtinfo_->sendAnnounceMessage("Time's up - you have lost the match!");
             this->end();
         }
@@ -63 +63 @@
         if (victim && victim->getPlayer())
         {
-            this->gtinfo_.sendAnnounceMessage("You're dead - you have lost the match!");
+            this->gtinfo_->sendAnnounceMessage("You're dead - you have lost the match!");
             this->end();
         }