Changeset 12000 for code/branches

Timestamp:

May 24, 2018, 4:06:39 PM (7 years ago)

Author:

adamc

Message:

Removed unnecessary core modifications

Location:

code/branches/ScriptableController_FS18/src/orxonox

Files:

• Level.h (modified) (1 diff)
• scriptablecontroller/scriptable_controller.h (modified) (2 diffs)

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

@@ -63 +63 @@
                 { 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);

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

@@ -12 +12 @@
 #include "worldentities/ControllableEntity.h"
 #include "tools/Timer.h"
-#include "Level.h"
+
 
 struct lua_State;
@@ -32 +32 @@
 {
 public:
-    Level* level_ = nullptr;
     /**
      * @brief Run a lua script