Changeset 12028 for code/branches/mergeFS18/src/libraries/core

Timestamp:

Oct 10, 2018, 3:16:51 PM (6 years ago)

Author:

merholzl

Message:

added scriptable controller

Location:

code/branches/mergeFS18

Files:

• . (modified) (1 prop)
• src/libraries/core/BaseObject.cc (modified) (1 diff)
• src/libraries/core/BaseObject.h (modified) (2 diffs)

code/branches/mergeFS18/src/libraries/core/BaseObject.cc

@@ -77 +77 @@
         {
             this->setFile(this->creator_->getFile());
-
+            
             // store strong-pointers on all four base objects by default (can be overwritten with weak-ptr after the constructor if necessary)
             this->setNamespace(this->creator_->namespace_.createStrongPtr());

code/branches/mergeFS18/src/libraries/core/BaseObject.h

@@ -58 +58 @@
     class Gametype;
     class Level;
+    class ScriptableController;
 
     /// The BaseObject is the parent of all classes representing an instance in the game.
@@ -191 +192 @@
 
             static void loadAllEventStates(Element& xmlelement, XMLPort::Mode mode, BaseObject* object, Identifier* identifier);
+
 
         protected: