Changeset 11167 for code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h

Timestamp:

Apr 14, 2016, 4:03:16 PM (9 years ago)

Author:

plehmann

Message:

changed the NewScriptController and Task classes

File:

• code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h (modified) (1 diff)

code/branches/plehmannFS16/src/orxonox/controllers/NewScriptController.h

@@ -57 +57 @@
             // tolua_begin 
 
+            void debugOut();
+
+            static NewScriptController* getNewScriptController();
+
+            int getID() { return ctrlid_; }
+
+            //tolua_end
+
             void createAndAddTask(Task newTask);
 
         private:
-            /* Information about the player that this ScriptController will
-             * control */
-            /* - Player pointer */
+            // Information about the player that this ScriptController will
+            // control 
+            // - Player pointer 
             PlayerInfo* player_;
 
-            /* - Entity pointer, this is for convenience and will be the same as 
-             *   player_->getControllableEntity() 
-             */
+            // - Entity pointer, this is for convenience and will be the same as 
+            //   player_->getControllableEntity() 
             ControllableEntity* entity_;
 
-            /* List of events to walk through */
+            // Controller ID, defaults to 0 and is set using takeControl() 
+            int ctrlid_;
+
+            // List of events to walk through 
             std::queue<Task>* taskList_;
 
 
-            /*List of Tasks currently active */
+            //List of Tasks currently active 
             std::vector<Task>* activeTasks_;
 
-            /* Time since the creation of this ScriptController object */
+            // Time since the creation of this ScriptController object
             float scTime_;