Changeset 10215 for code/branches/presentationFS14/src/orxonox

Timestamp:

Jan 31, 2015, 5:31:23 PM (9 years ago)

Author:

landauf

Message:

replaced tabs with spaces. no changes in code.

Location:

code/branches/presentationFS14/src/orxonox/controllers

Files:

• ControllerDirector.cc (modified) (2 diffs)
• ControllerDirector.h (modified) (1 diff)

code/branches/presentationFS14/src/orxonox/controllers/ControllerDirector.cc

@@ -106 +106 @@
     } 
 
-        
     bool ControllerDirector::preparationToTakeControl(BaseObject * trigger) 
     {
@@ -130 +129 @@
         }
 
-        this->entity_ = this->player_->getControllableEntity();
-        assert(this->entity_);
+        this->entity_ = this->player_->getControllableEntity();
+        assert(this->entity_);
 
         return true;

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

@@ -45 +45 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             bool party(bool bTriggered, BaseObject* trigger);
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
-        
-        
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
+
+
             /* Take over control of a given object */
-            void takeControl(Controller * controller, BaseObject * trigger);
-            bool preparationToTakeControl(BaseObject * trigger);
+            void takeControl(Controller * controller, BaseObject * trigger);
+            bool preparationToTakeControl(BaseObject * trigger);
 
             // currently unused
-            //void setNewController(Controller * controller);
-        
-
+            //void setNewController(Controller * controller);
 
         private:
-           
             PlayerInfo* player_;
             ControllableEntity* entity_; 
             PlayerTrigger * pTrigger_;
             Context* context_;
-        
-
     };
 }