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

Timestamp:

Sep 7, 2008, 5:03:10 PM (16 years ago)

Author:

scheusso

Message:

network branch merged into trunk

File:

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

code/trunk/src/network/Client.h

@@ -46 +46 @@
 #include <string>
 
+#include "Host.h"
+#include "packet/Chat.h"
 #include "ClientConnection.h"
-#include "PacketManager.h"
-#include "GameStateClient.h"
+#include "GamestateClient.h"
 //#include "NetworkFrameListener.h"
 
@@ -62 +63 @@
   *
   */
-  class _NetworkExport Client : PacketDecoder{
+  class _NetworkExport Client : public Host{
   public:
-    
-    static Client* createSingleton();
-    static Client* createSingleton(std::string address, int port);
-    static Client* createSingleton(const char *address, int port);
-    static void destroySingleton();
-    static Client *getSingleton();
-    
-    bool establishConnection();
-    bool closeConnection();
-
-    static void Chat( std::string message );
-    
-    int getShipID(){return shipID_;}
-    int getClientID(){return clientID_;}
-
-    void tick(float time);
-
-  private:
     Client();
     Client(std::string address, int port);
@@ -87 +70 @@
     ~Client();
     
-    static Client* _sClient;
+    bool establishConnection();
+    bool closeConnection();
+    bool queuePacket(ENetPacket *packet, int clientID);
+    bool processChat(packet::Chat *message, unsigned int clientID);
+    //bool sendChat(packet::Chat *chat);
+    
+//    static void Chat( std::string message );
+    
+    unsigned int shipID(){return shipID_;}
+    int playerID(){return clientID_;}
+    //static void setShipID( unsigned int shipID){ dynamic_cast<Client *>(instance_)->shipID_=shipID; }
+    static void setClientID( unsigned int clientID){ dynamic_cast<Client *>(instance_)->clientID_=clientID; }
+    
+    void tick(float time);
+
+  private:
     
     ClientConnection client_connection;
-    PacketGenerator pck_gen;
-    GameStateClient gamestate;
+    GamestateClient gamestate;
     bool isConnected;
     bool isSynched_;
@@ -98 +95 @@
     
     // implement data processing functions of PacketDecoder
-    void processGamestate( GameStateCompressed *data, int clientID);
-    void processClassid(classid *clid);
-    void processChat( chat *data, int clientId );
-    bool processWelcome( welcome *w );
+//     void processChat( chat *data, int clientId );
     int clientID_;     // this is the id the server gave to us
     int shipID_;