Changeset 11861 for code/branches
- Timestamp:
- Apr 12, 2018, 4:16:02 PM (7 years ago)
- Location:
- code/branches/ScriptableController_FS18
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/ScriptableController_FS18/data/levels/scriptController.oxw
r10622 r11861 18 18 19 19 <Level 20 gametype = Deathmatch20 21 21 > 22 22 <templates> -
code/branches/ScriptableController_FS18/src/orxonox/Level.cc
r11855 r11861 81 81 XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype"); 82 82 83 XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode) ;83 XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode).defaultValues("scripts/empty.lua"); 84 84 85 85 XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode); -
code/branches/ScriptableController_FS18/src/orxonox/Level.h
r11855 r11861 87 87 88 88 inline void setScript(const std::string &script) 89 { this->level_script_ = script; } 89 { 90 orxout(internal_warning) << "hi world" << endl; 91 this->level_script_ = script; } 90 92 91 93 -
code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.cc
r11854 r11861 14 14 int ret; 15 15 16 // Not having a script specified at all is not an error 17 if(file_path.empty()) 16 // Not having a script specified at all is not an error. 17 if(file_path.empty()){ 18 orxout(internal_warning) << "No script specified!" << std::endl; 18 19 return 0; 20 } 19 21 20 22 // Create a lua object … … 26 28 } 27 29 28 // Make standard libraries available in the Lua object 30 // Make standard libraries available in the Lua object. 29 31 luaL_openlibs(lua); 30 32
Note: See TracChangeset
for help on using the changeset viewer.