Changeset 9587 for code/branches/core6

Timestamp:

Mar 26, 2013, 11:33:01 PM (11 years ago)

Author:

landauf

Message:

I decided that Synchronisable and Tickable should also be OrxonoxInterfaces; even though they're not part of the game logic they're specifically targeted towards game classes

Location:

code/branches/core6/src/libraries

Files:

• network/synchronisable/Synchronisable.h (modified) (2 diffs)
• tools/interfaces/Tickable.h (modified) (2 diffs)

code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h

@@ -41 +41 @@
 #include "util/mbool.h"
 #include "util/Output.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 #include "SynchronisableVariable.h"
 #include "NetworkCallback.h"
@@ -144 +144 @@
   * @author Oliver Scheuss
   */
-  class _NetworkExport Synchronisable : virtual public OrxonoxClass{
+  class _NetworkExport Synchronisable : virtual public OrxonoxInterface {
   public:
     friend class packet::Gamestate;

code/branches/core6/src/libraries/tools/interfaces/Tickable.h

@@ -44 +44 @@
 #include "tools/ToolsPrereqs.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 #include "core/class/Super.h"
 
@@ -50 +50 @@
 {
     //! The Tickable interface provides a tick(dt) function, that gets called every frame.
-    class _ToolsExport Tickable : virtual public OrxonoxClass
+    class _ToolsExport Tickable : virtual public OrxonoxInterface
     {
         public: