Changeset 10025 for code/branches/ScriptableController/src/orxonox

Timestamp:

Apr 10, 2014, 1:19:01 PM (11 years ago)

Author:

samuezu

Message:

created scriptcontroller header and *.cc file

Location:

code/branches/ScriptableController/src/orxonox/controllers

Files:

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

code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc

@@ -40 +40 @@
     }
 
-    void set_luasrc(string lsrc)
+    void set_luasrc(std::string lsrc)
     {
         this->luasrc=lsrc;
     }
 
-    void set_controlled(&ControllableEntity toControl)
+    void set_controlled(*ControllableEntity toControl)
     {
         this->controlled=toControl;

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

@@ -46 +46 @@
             
            
-            void set_luasrc(string);
+            void set_luasrc(std::string);
 
-            void set_controlled(&ControllableEntity);
+            void set_controlled(*ControllableEntity);
 
             void moveToPosition(const Vector3& target);
@@ -62 +62 @@
 
         private:
-                string luasrc;          // name of the LUA-sourcefile that shall be executed->see XMLPort-function
+                std::string luasrc;             // name of the LUA-sourcefile that shall be executed->see XMLPort-function
 
             ControllableEntity* controlled; //entity controlled by this SC