Changeset 1535 for code/trunk/src/network

Timestamp:

Jun 4, 2008, 8:54:43 PM (17 years ago)

Author:

rgrieder

Message:

merged input branch back to trunk

Location:

code/trunk/src/network

Files:

• Client.h (modified) (2 diffs)
• Server.h (modified) (2 diffs)

code/trunk/src/network/Client.h

@@ -46 +46 @@
 #include <string>
 
-#include "core/Tickable.h"
 #include "ClientConnection.h"
 #include "PacketManager.h"
@@ -63 +62 @@
   *
   */
-  class _NetworkExport Client : PacketDecoder, public orxonox::Tickable{
+  class _NetworkExport Client : PacketDecoder{
   public:
     

code/trunk/src/network/Server.h

@@ -46 +46 @@
 #include <string>
 
-#include "core/Tickable.h"
 #include "PacketManager.h"
 
@@ -59 +58 @@
   * It implements all functions necessary for a Server
   */
-  class _NetworkExport Server : public PacketDecoder, public orxonox::Tickable{
+  class _NetworkExport Server : public PacketDecoder{
   public:
     static Server *createSingleton();