Changeset 1021 for code/trunk/src/orxonox/objects/WorldEntity.h

Timestamp:

Apr 10, 2008, 5:03:34 PM (16 years ago)

Author:

bknecht

Message:

merged back that script-branch

File:

• code/trunk/src/orxonox/objects/WorldEntity.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/WorldEntity.h

@@ -12 +12 @@
 //#include "util/tinyxml/tinyxml.h"
 #include "core/BaseObject.h"
-#include "Tickable.h"
+#include "core/Tickable.h"
 #include "../tools/Mesh.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport WorldEntity : public BaseObject, public Tickable//, public network::Synchronisable
+    class _OrxonoxExport WorldEntity : public BaseObject, public Tickable, public network::Synchronisable
     {
         public:
@@ -26 +26 @@
             virtual void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, bool loading);
-            bool create();
+            inline bool create(){ return true; }
 
             void attachWorldEntity(WorldEntity* entity);