Changeset 3049 for code/trunk/src/orxonox/objects/gametypes

Timestamp:

May 25, 2009, 3:26:43 AM (15 years ago)

Author:

landauf

Message:

• Added option to add a Controller to a ControllableEntity in the XML file
• Added two new classes: WaypointController (follows waypoints) and WaypointPatrolController (follows waypoints and kills enemies within a given radius)
• Radarpoints in TeamDeathmatch are now coloured

Location:

code/trunk/src/orxonox/objects/gametypes

Files:

• TeamDeathmatch.cc (modified) (1 diff)
• TeamDeathmatch.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -164 +164 @@
             if (pawn)
             {
+                pawn->setRadarObjectColour(this->teamcolours_[it_player->second]);
+
                 std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
                 for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h

@@ -55 +55 @@
             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
 
+            int getTeam(PlayerInfo* player);
+
             inline const ColourValue& getTeamColour(int teamnr) const
                 { return this->teamcolours_[teamnr]; }
@@ -61 +63 @@
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
             bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
-            int getTeam(PlayerInfo* player);
 
             std::map<PlayerInfo*, int> teamnumbers_;