Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11861 for code/branches


Ignore:
Timestamp:
Apr 12, 2018, 4:16:02 PM (7 years ago)
Author:
adamc
Message:

scriptablecontroller fixed the No-Script-Option_Error (?)

Location:
code/branches/ScriptableController_FS18
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • code/branches/ScriptableController_FS18/data/levels/scriptController.oxw

    r10622 r11861  
    1818
    1919<Level
    20   gametype = Deathmatch
     20 
    2121>
    2222  <templates>
  • code/branches/ScriptableController_FS18/src/orxonox/Level.cc

    r11855 r11861  
    8181        XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
    8282
    83         XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode);
     83        XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode).defaultValues("scripts/empty.lua");
    8484
    8585        XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
  • code/branches/ScriptableController_FS18/src/orxonox/Level.h

    r11855 r11861  
    8787
    8888            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; }
    9092
    9193
  • code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.cc

    r11854 r11861  
    1414    int ret;
    1515
    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;
    1819        return 0;
     20    }
    1921
    2022    // Create a lua object
     
    2628    }
    2729
    28     // Make standard libraries available in the Lua object
     30    // Make standard libraries available in the Lua object.
    2931    luaL_openlibs(lua);
    3032
Note: See TracChangeset for help on using the changeset viewer.