Changeset 8997 for code/branches

Timestamp:

Dec 18, 2011, 1:58:58 PM (13 years ago)

Author:

jo

Message:

Small edits. Documentation.

Location:

code/branches/presentation2011/src/orxonox/gametypes

Files:

• Mission.cc (modified) (2 diffs)
• TeamGametype.cc (modified) (2 diffs)

code/branches/presentation2011/src/orxonox/gametypes/Mission.cc

@@ -28 +28 @@
 
 #include "Mission.h"
-//#include "TeamGametype.h"
 #include "items/Engine.h"
 #include "controllers/ArtificialController.h"
@@ -72 +71 @@
         Gametype::start();
         this->setTeams();
-        /*for (ObjectList<Engine>::iterator it = ObjectList<Engine>::begin(); it != ObjectList<Engine>::end(); ++it)
-            it->setActive(false); // works -> @sr :*/
+
         this->gtinfo_->sendAnnounceMessage("Your mission has started!");
     }
-
-    //void Mission::addBots(unsigned int amount)
 
     void Mission::end()

code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc

@@ -278 +278 @@
     }
 
+    /**
+    @brief
+        Colours a pawn depending on the team values set in XML.
+        A pawn is coloured depending on it's team set via XML.
+        If there is a controller the pawn is coloured depending on its team which also can be set via XML.
+    */
     void TeamGametype::setDefaultObjectColour(Pawn* pawn)
     {
@@ -311 +317 @@
 
     void TeamGametype::colourPawn(Pawn* pawn, int teamNr)
-    {// catch no-colouring-case and wrong input
+    {// catch: no-colouring-case and wrong input
         if(teamNr < 0 || teamNr+1 > this->teamcolours_.size() ||pawn == NULL) return;
         pawn->setRadarObjectColour(this->teamcolours_[teamNr]);