Changeset 425 for code/branches/FICN/src/network

Timestamp:

Dec 5, 2007, 10:06:29 PM (17 years ago)

Author:

scheusso

Message:

some minor changes

Location:

code/branches/FICN/src/network

Files:

• Client.cc (modified) (5 diffs)
• Client.h (modified) (1 diff)
• GameStateManager.cc (modified) (2 diffs)
• GameStateManager.h (modified) (1 diff)
• Server.cc (modified) (1 diff)

code/branches/FICN/src/network/Client.cc

@@ -68 +68 @@
   bool Client::sendMouse(double x, double y){
     // generate packet and add it to the queue
+    if(!isConnected)
+      return false;
     if(!client_connection.addPacket(pck_gen.mousem(x, y)))
         return false;
@@ -81 +83 @@
   bool Client::sendKeyboard(char key_code){
     // generate packet and add it to queue
+    if(!isConnected)
+      return false;
     if(!client_connection.addPacket(pck_gen.keystrike(key_code)))
         return false;
@@ -118 +122 @@
    */
   bool Client::sendPackets(){
+    if(!isConnected)
+      return false;
     ENetEvent event;
     // send packets
@@ -142 +148 @@
   void Client::processGamestate( GameStateCompressed *data){
     gamestate.pushGameState(*data);
+    client_connection.addPacket(pck_gen.acknowledgement(data->id));
+    client_connection.sendPackets();
     return;
   }
@@ -153 +161 @@
   }
   
+  void Client::processChat( chat *data){
+    std::cout << "Server: " << data->message << std::endl;
+  }
+  
 }

code/branches/FICN/src/network/Client.h

@@ -58 +58 @@
   void processGamestate( GameStateCompressed *data);
   void processClassid(classid *clid);
-
+  void processChat( chat *data);
 };
 

code/branches/FICN/src/network/GameStateManager.cc

@@ -31 +31 @@
 
 GameStateCompressed GameStateManager::popGameState(int clientID){
-  GameState *client = clientGameState[clientID];  
+  GameState *client = clientGameState[clientID];
   GameState *server = reference;
   return encode(client, server);
@@ -160 +160 @@
 }
 
+void GameStateManager::removeClient(int clientID){
+  clientGameState.erase(clientGameState.begin()+clientID);
+}
+
 }
 

code/branches/FICN/src/network/GameStateManager.h

@@ -48 +48 @@
   GameStateCompressed popGameState(int clientID);
   void ackGameState(int clientID, int gamestateID);
+  void removeClient(int clientID);
 private:
   GameState *getSnapshot(int id);

code/branches/FICN/src/network/Server.cc

@@ -115 +115 @@
   }
   
+  /**
+   * sends the gamestate
+   */
   bool Server::sendGameState(){
-    
+    return true;
   }