[Orxonox-commit 4326] r8997 - code/branches/presentation2011/src/orxonox/gametypes

[jo at orxonox.net]

Author: jo
Date: 2011-12-18 13:58:58 +0100 (Sun, 18 Dec 2011)
New Revision: 8997

Modified:
   code/branches/presentation2011/src/orxonox/gametypes/Mission.cc
   code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc
Log:
Small edits. Documentation.

Modified: code/branches/presentation2011/src/orxonox/gametypes/Mission.cc
===================================================================
--- code/branches/presentation2011/src/orxonox/gametypes/Mission.cc	2011-12-18 00:18:51 UTC (rev 8996)
+++ code/branches/presentation2011/src/orxonox/gametypes/Mission.cc	2011-12-18 12:58:58 UTC (rev 8997)
@@ -27,7 +27,6 @@
  */
 
 #include "Mission.h"
-//#include "TeamGametype.h"
 #include "items/Engine.h"
 #include "controllers/ArtificialController.h"
 
@@ -71,13 +70,10 @@
     {
         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()
     {
         Gametype::end();

Modified: code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc
===================================================================
--- code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc	2011-12-18 00:18:51 UTC (rev 8996)
+++ code/branches/presentation2011/src/orxonox/gametypes/TeamGametype.cc	2011-12-18 12:58:58 UTC (rev 8997)
@@ -277,6 +277,12 @@
         }
     }
 
+    /**
+    @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)
     {
         if(pawn == NULL)
@@ -310,7 +316,7 @@
     }
 
     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]);