Changeset 1232 for code/branches/network3/src/network/ConnectionManager.h

Timestamp:

May 5, 2008, 1:19:22 AM (16 years ago)

Author:

scheusso

Message:

a lot of changes in order to make it possible to have mulpiple clients with each one a new ship
camera changes
object changes
synchronisable: backsyncronisation should be possible now
gamestatemanager/gamestateclient: functions for backsyncronisation
some changes in order to get the input system (the old one) on the client working
TODO something with the camera position is wrong at the moment (clientside)

File:

• code/branches/network3/src/network/ConnectionManager.h (modified) (4 diffs)

code/branches/network3/src/network/ConnectionManager.h

@@ -71 +71 @@
   class ConnectionManager{
   public:
+    ConnectionManager();
     ConnectionManager(ClientInformation *head);
     ConnectionManager(int port, const char *address, ClientInformation *head);
@@ -84 +85 @@
     bool sendPackets(ENetEvent *event);
     bool sendPackets();
+    bool createClient(int clientID);
 
-    //##### for testing purpose only #####
-    ConnectionManager();
-    std::map<int, int> testGetClientsShip() { 
-      return clientsShip; 
-    }
-    void testAddClientsShipID( int clientID, int objectID ) {
-      addClientsObjectID( clientID, objectID );
-    }
-    int testGetClientsShipID( int clientID ) { 
-      return getClientsShipID( clientID ); 
-    }
-    int testGetObjectsClientID( int objectID ) {
-       return getObjectsClientID( objectID );
-    }
-    void testDeleteClientsIDReg( int clientID ) { 
-      deleteClientIDReg( clientID );
-    }
-    void testDeleteObjectIDReg( int objectID ) {
-      deleteObjectIDReg( objectID );
-    }
-    //##### for testing purpose only #####
   private:
     bool clientDisconnect(ENetPeer *peer);
-    //bool clientDisconnect(ENetPeer peer);
     bool processData(ENetEvent *event);
     bool addClient(ENetEvent *event);
@@ -117 +97 @@
     void syncClassid(int clientID);
     ENetPeer *getClientPeer(int clientID);
+    bool createShip(ClientInformation *client);
+    bool sendWelcome(int clientID, int shipID, bool allowed);
+    bool addFakeConnectRequest(ENetEvent *ev);
     PacketBuffer buffer;
     PacketGenerator packet_gen;
@@ -126 +109 @@
     ClientInformation *head_;
 
+    
+//     int getNumberOfClients();
     //functions to map what object every clients uses
-    std::map<int, int> clientsShip;
+    /*std::map<int, int> clientsShip;
     void addClientsObjectID( int clientID, int objectID );
     int getClientsShipID( int clientID );
     int getObjectsClientID( int objectID );
     void deleteClientIDReg( int clientID );
-    void deleteObjectIDReg( int objectID );
-    int getNumberOfClients();
+    void deleteObjectIDReg( int objectID );*/
   };