Changeset 9666 for code/trunk

Timestamp:

Aug 25, 2013, 10:21:41 AM (11 years ago)

Author:

landauf

Message:

comments

Location:

code/trunk/src/orxonox

Files:

• controllers/Controller.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (1 diff)

code/trunk/src/orxonox/controllers/Controller.h

@@ -65 +65 @@
             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)

code/trunk/src/orxonox/worldentities/pawns/Pawn.cc

@@ -333 +333 @@
                     if(!entity->hasHumanController())
                     {
-                        // delete the AIController
+                        // delete the AIController // <-- TODO: delete? nothing is deleted here... should we delete the controller?
                         slave->setControllableEntity(0);