[Orxonox-commit 4997] r9666 - in code/trunk/src/orxonox: controllers worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2013-08-25 10:21:41 +0200 (Sun, 25 Aug 2013)
New Revision: 9666

Modified:
   code/trunk/src/orxonox/controllers/Controller.h
   code/trunk/src/orxonox/worldentities/pawns/Pawn.cc
Log:
comments

Modified: code/trunk/src/orxonox/controllers/Controller.h
===================================================================
--- code/trunk/src/orxonox/controllers/Controller.h	2013-08-25 08:05:37 UTC (rev 9665)
+++ code/trunk/src/orxonox/controllers/Controller.h	2013-08-25 08:21:41 UTC (rev 9666)
@@ -64,6 +64,7 @@
                 { return this->controllableEntity_; }
             virtual void changedControllableEntity() {}
 
+//        protected:
             // don't use this directly, use getPlayer()->startControl(entity) (unless you know exactly what you do)
             inline void setControllableEntity(ControllableEntity* entity)
             {

Modified: code/trunk/src/orxonox/worldentities/pawns/Pawn.cc
===================================================================
--- code/trunk/src/orxonox/worldentities/pawns/Pawn.cc	2013-08-25 08:05:37 UTC (rev 9665)
+++ code/trunk/src/orxonox/worldentities/pawns/Pawn.cc	2013-08-25 08:21:41 UTC (rev 9666)
@@ -332,7 +332,7 @@
 
                     if(!entity->hasHumanController())
                     {
-                        // delete the AIController
+                        // delete the AIController // <-- TODO: delete? nothing is deleted here... should we delete the controller?
                         slave->setControllableEntity(0);
 
                         // set a new master within the formation