Changeset 11855 for code/branches/ScriptableController_FS18/src/libraries/core

Timestamp:

Apr 12, 2018, 2:07:03 PM (7 years ago)

Author:

adamc

Message:

merged HS17 into FS18

Location:

code/branches/ScriptableController_FS18

Files:

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

code/branches/ScriptableController_FS18/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: