Changeset 11690 for code/branches/Presentation_HS17/src/orxonox/Level.cc

Timestamp:

Dec 18, 2017, 12:40:00 PM (7 years ago)

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• src/orxonox/Level.cc (modified) (3 diffs)

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

@@ -42 +42 @@
 #include "overlays/OverlayGroup.h"
 #include "LevelManager.h"
-#include "scriptablecontroller/scriptable_controller.h"
 
 namespace orxonox
@@ -57 +56 @@
         this->xmlfilename_ = this->getFilename();
         this->xmlfile_ = nullptr;
-        this->controller_.reset(new ScriptableController());
     }
 
@@ -80 +78 @@
         XMLPortParam(Level, "plugins",  setPluginsString,  getPluginsString,  xmlelement, mode);
         XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
-
-        XMLPortParamLoadOnly(Level, "script", setScript, xmlelement, mode);
 
         XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);