Changeset 11861

Timestamp:

Apr 12, 2018, 4:16:02 PM (6 years ago)

Author:

adamc

Message:

scriptablecontroller fixed the No-Script-Option_Error

Location:

code/branches/ScriptableController_FS18

Files:

• data/levels/scriptController.oxw (modified) (1 diff)
• src/orxonox/Level.cc (modified) (1 diff)
• src/orxonox/Level.h (modified) (1 diff)
• src/orxonox/scriptablecontroller/scriptable_controller.cc (modified) (2 diffs)

code/branches/ScriptableController_FS18/data/levels/scriptController.oxw

@@ -18 +18 @@
 
 <Level
-  gametype = Deathmatch
+  
 >
   <templates>

code/branches/ScriptableController_FS18/src/orxonox/Level.cc

@@ -81 +81 @@
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
 
-        XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode);
+        XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode).defaultValues("scripts/empty.lua");
 
         XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);

code/branches/ScriptableController_FS18/src/orxonox/Level.h

@@ -87 +87 @@
 
             inline void setScript(const std::string &script)
-                { this->level_script_ = script; }
+                {   
+                    orxout(internal_warning) << "hi world" << endl;
+                    this->level_script_ = script; }
 
 

code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.cc

@@ -14 +14 @@
     int ret;
 
-    // Not having a script specified at all is not an error
-    if(file_path.empty())
+    // Not having a script specified at all is not an error.
+    if(file_path.empty()){
+        orxout(internal_warning) << "No script specified!" << std::endl;
         return 0;
+    }
 
     // Create a lua object
@@ -26 +28 @@
     }
 
-    // Make standard libraries available in the Lua object
+    // Make standard libraries available in the Lua object.
     luaL_openlibs(lua);