[Orxonox-commit 4918] r9587 - in code/branches/core6/src/libraries: network/synchronisable tools/interfaces

[landauf at orxonox.net]

Author: landauf
Date: 2013-03-26 23:33:01 +0100 (Tue, 26 Mar 2013)
New Revision: 9587

Modified:
   code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h
   code/branches/core6/src/libraries/tools/interfaces/Tickable.h
Log:
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

Modified: code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h	2013-03-26 22:30:57 UTC (rev 9586)
+++ code/branches/core6/src/libraries/network/synchronisable/Synchronisable.h	2013-03-26 22:33:01 UTC (rev 9587)
@@ -40,7 +40,7 @@
 
 #include "util/mbool.h"
 #include "util/Output.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 #include "SynchronisableVariable.h"
 #include "NetworkCallback.h"
 
@@ -143,7 +143,7 @@
   * Every class, that inherits from this class has to link the DATA THAT NEEDS TO BE SYNCHRONISED into the linked list.
   * @author Oliver Scheuss
   */
-  class _NetworkExport Synchronisable : virtual public OrxonoxClass{
+  class _NetworkExport Synchronisable : virtual public OrxonoxInterface {
   public:
     friend class packet::Gamestate;
     virtual ~Synchronisable();

Modified: code/branches/core6/src/libraries/tools/interfaces/Tickable.h
===================================================================
--- code/branches/core6/src/libraries/tools/interfaces/Tickable.h	2013-03-26 22:30:57 UTC (rev 9586)
+++ code/branches/core6/src/libraries/tools/interfaces/Tickable.h	2013-03-26 22:33:01 UTC (rev 9587)
@@ -43,13 +43,13 @@
 
 #include "tools/ToolsPrereqs.h"
 
-#include "core/class/OrxonoxClass.h"
+#include "core/class/OrxonoxInterface.h"
 #include "core/class/Super.h"
 
 namespace orxonox
 {
     //! 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:
             /**