Changeset 2818 for code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc

Timestamp:

Mar 22, 2009, 9:40:35 PM (15 years ago)

Author:

landauf

Message:

added two new functions to Gametype

File:

• code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc (modified) (3 diffs)

code/branches/miniprojects/src/orxonox/objects/gametypes/TeamGametype.cc

@@ -34 +34 @@
 #include "objects/Teamcolourable.h"
 #include "objects/worldentities/TeamSpawnPoint.h"
-#include "objects/infos/PlayerInfo.h" // remove this
 
 namespace orxonox
@@ -151 +150 @@
     }
 
-    void TeamGametype::playerPostSpawn(PlayerInfo* player)
+    void TeamGametype::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
     {
         if (!player)
@@ -160 +159 @@
         if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < this->teamcolours_.size())
         {
-            if (player->getControllableEntity())
+            if (pawn)
             {
-                std::set<WorldEntity*> pawnAttachments = player->getControllableEntity()->getAttachedObjects();
+                std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
                 for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)
                 {