[Orxonox-commit 7383] r12000 - in code/branches/ScriptableController_FS18/src/orxonox: . scriptablecontroller

[adamc at orxonox.net]

Author: adamc
Date: 2018-05-24 16:06:39 +0200 (Thu, 24 May 2018)
New Revision: 12000

Modified:
   code/branches/ScriptableController_FS18/src/orxonox/Level.h
   code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.h
Log:
Removed unnecessary core modifications

Modified: code/branches/ScriptableController_FS18/src/orxonox/Level.h
===================================================================
--- code/branches/ScriptableController_FS18/src/orxonox/Level.h	2018-05-24 13:59:22 UTC (rev 11999)
+++ code/branches/ScriptableController_FS18/src/orxonox/Level.h	2018-05-24 14:06:39 UTC (rev 12000)
@@ -62,14 +62,11 @@
             inline const std::string &getScript(void)
                 { return this->level_script_; }
 
+        private:
+            void registerVariables();
             void addObject(BaseObject* object);
             BaseObject* getObject(unsigned int index) const;
 
-        private:
-            void registerVariables();
-            //void addObject(BaseObject* object);
-            //BaseObject* getObject(unsigned int index) const;
-
             void addLodInfo(MeshLodInformation* object);
             void networkCallbackTemplatesChanged();
 //            const MeshLodInformation* getLodInfo(std::string meshName) const;

Modified: code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.h
===================================================================
--- code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.h	2018-05-24 13:59:22 UTC (rev 11999)
+++ code/branches/ScriptableController_FS18/src/orxonox/scriptablecontroller/scriptable_controller.h	2018-05-24 14:06:39 UTC (rev 12000)
@@ -11,8 +11,8 @@
 #include "worldentities/WorldEntity.h"
 #include "worldentities/ControllableEntity.h"
 #include "tools/Timer.h"
-#include "Level.h"
 
+
 struct lua_State;
 
 namespace orxonox
@@ -31,7 +31,6 @@
 class ScriptableController
 {
 public:
-    Level* level_ = nullptr;
     /**
      * @brief Run a lua script
      * @param file_path Path to the script