- Timestamp:
- Apr 10, 2014, 1:19:01 PM (11 years ago)
- Location:
- code/branches/ScriptableController/src/orxonox/controllers
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ScriptableController/src/orxonox/controllers/ScriptController.cc
r10020 r10025 40 40 } 41 41 42 void set_luasrc(st ring lsrc)42 void set_luasrc(std::string lsrc) 43 43 { 44 44 this->luasrc=lsrc; 45 45 } 46 46 47 void set_controlled( &ControllableEntity toControl)47 void set_controlled(*ControllableEntity toControl) 48 48 { 49 49 this->controlled=toControl; -
code/branches/ScriptableController/src/orxonox/controllers/ScriptController.h
r10020 r10025 46 46 47 47 48 void set_luasrc(st ring);48 void set_luasrc(std::string); 49 49 50 void set_controlled( &ControllableEntity);50 void set_controlled(*ControllableEntity); 51 51 52 52 void moveToPosition(const Vector3& target); … … 62 62 63 63 private: 64 st ring luasrc; // name of the LUA-sourcefile that shall be executed->see XMLPort-function64 std::string luasrc; // name of the LUA-sourcefile that shall be executed->see XMLPort-function 65 65 66 66 ControllableEntity* controlled; //entity controlled by this SC
Note: See TracChangeset
for help on using the changeset viewer.