Changeset 1021 for code/trunk/src/network/Server.h

Timestamp:

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

Author:

bknecht

Message:

merged back that script-branch

File:

• code/trunk/src/network/Server.h (modified) (2 diffs)

code/trunk/src/network/Server.h

@@ -16 +16 @@
 #include <string>
 
+#include "NetworkPrereqs.h"
+
+#include "core/Tickable.h"
 #include "PacketManager.h"
-#include "NetworkPrereqs.h"
+
+
 
 namespace network
@@ -25 +29 @@
   * It implements all functions necessary for a Server
   */
-  class _NetworkExport Server : public PacketDecoder{
+  class _NetworkExport Server : public PacketDecoder, public orxonox::Tickable{
   public:
     Server();