Changeset 10024 for code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h

Timestamp:

Apr 10, 2014, 1:15:58 PM (11 years ago)

Author:

mkronig

Message:

changes on controllerDirector project

File:

• code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h (modified) (2 diffs)

code/branches/ScriptableController/src/orxonox/controllers/ControllerDirector.h

@@ -45 +45 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             bool party(bool bTriggered, BaseObject* trigger);
-            void tick(float dt);
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+        
+        
+        
             void takeControl(Controller * controller, BaseObject * trigger);
             bool preparationToTakeControl(BaseObject * trigger);
             void setNewController(Controller * controller);
+        
 
 
@@ -55 +59 @@
            PlayerInfo* player_;
 
-           ControllableEntity* entity_; 
+           ControllableEntity* entity_; 
 
            PlayerTrigger * pTrigger_;