Changeset 3214 for code/trunk/src/network/Client.h

Timestamp:

Jun 23, 2009, 6:02:25 PM (16 years ago)

Author:

scheusso

Message:

merged netp5 back to trunk

File:

• code/trunk/src/network/Client.h (modified) (4 diffs)

code/trunk/src/network/Client.h

@@ -45 +45 @@
 
 #include <string>
-
-#include "Host.h"
-#include "packet/Chat.h"
 #include "ClientConnection.h"
 #include "GamestateClient.h"
-
+#include "Host.h"
 
 namespace orxonox
@@ -61 +58 @@
   *
   */
-  class _NetworkExport Client : public Host{
+  class _NetworkExport Client : public Host, public ClientConnection{
   public:
     Client();
     Client(const std::string& address, int port);
-    Client(const char *address, int port);
     ~Client();
 
@@ -74 +70 @@
     virtual bool chat(const std::string& message);
     virtual bool broadcast(const std::string& message) { return false; }
-    //bool sendChat(packet::Chat *chat);
 
     void update(const Clock& time);
@@ -82 +77 @@
     virtual bool isServer_(){return false;}
 
-    ClientConnection client_connection;
     GamestateClient gamestate;
-    bool isConnected;
     bool isSynched_;