Changeset 10622 for code/trunk/src/orxonox/controllers/ControllerDirector.h

Timestamp:

Oct 4, 2015, 3:45:56 PM (10 years ago)

Author:

landauf

Message:

merged branch presentationFS15merge back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/controllers/ControllerDirector.h (modified) (2 diffs)

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

@@ -47 +47 @@
             virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
 
+            inline void setScriptName(const std::string& name) { this->scriptname_ = name; }
+            inline const std::string& getScriptName() const { return this->scriptname_; }
+
 
             /* Take over control of a given object */
@@ -55 +58 @@
             //void setNewController(Controller * controller);
 
-        private:
+        protected:
+            std::string scriptname_;   
             PlayerInfo* player_;
             ControllableEntity* entity_;