[Orxonox-commit 5362] r10025 - code/branches/ScriptableController/src/orxonox/controllers

[samuezu at orxonox.net]

Author: samuezu
Date: 2014-04-10 13:19:01 +0200 (Thu, 10 Apr 2014)
New Revision: 10025

Modified:
   code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc
   code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h
Log:
created scriptcontroller header and *.cc file

Modified: code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc
===================================================================
--- code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc	2014-04-10 11:15:58 UTC (rev 10024)
+++ code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc	2014-04-10 11:19:01 UTC (rev 10025)
@@ -39,12 +39,12 @@
         set_controlled(CE);
     }
 
-    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;
     }

Modified: code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h
===================================================================
--- code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h	2014-04-10 11:15:58 UTC (rev 10024)
+++ code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h	2014-04-10 11:19:01 UTC (rev 10025)
@@ -45,9 +45,9 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             
            
-            void set_luasrc(string);
+            void set_luasrc(std::string);
 
-            void set_controlled(&ControllableEntity);
+            void set_controlled(*ControllableEntity);
 
             void moveToPosition(const Vector3& target);
 
@@ -61,7 +61,7 @@
             //function to execute the luafile
 
         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