Changeset 9625 for code/trunk/src/orxonox/controllers/Controller.h

Timestamp:

May 21, 2013, 3:12:21 PM (11 years ago)

Author:

smerkli

Message:

Merged Maxim's Branch back into trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/Controller.h (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)