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

Timestamp:

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

Author:

patricwi

Message:

rolled back to functional without 2 branches

Location:

code/branches/Presentation_HS17

Files:

• . (modified) (1 prop)
• src/orxonox/Level.h (modified) (4 diffs)

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

@@ -42 +42 @@
 namespace orxonox
 {
-    class ScriptableController;
-
     class _OrxonoxExport Level : public BaseObject, public Synchronisable, public Context
     {
@@ -56 +54 @@
 
             MeshLodInformation* getLodInfo(std::string meshName) const;
-
-            inline ScriptableController *getScriptableController(void)
-                { return this->controller_.get(); }
-
-            inline const std::string &getScript(void)
-                { return this->level_script_; }
 
 
@@ -86 +78 @@
             void networkcallback_applyXMLFile();
 
-            inline void setScript(const std::string &script)
-                { this->level_script_ = script; }
-
-
             std::string                    pluginsString_;
             std::list<PluginReference*>    plugins_;
+
             std::string                    gametype_;
             std::string                    xmlfilename_;
@@ -97 +86 @@
             std::list<BaseObject*>         objects_;
             std::map<std::string,MeshLodInformation*>  lodInformation_;
-
-            std::unique_ptr<ScriptableController> controller_;
-            std::string           level_script_;
     };
 }