Changeset 907

Timestamp:

Mar 20, 2008, 3:03:23 PM (17 years ago)

Author:

scheusso

Message:

further optimasation/bugfixing

Location:

code/branches/network/src/network

Files:

• Client.cc (modified) (2 diffs)
• PacketManager.h (modified) (1 diff)
• Server.cc (modified) (3 diffs)

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

@@ -184 +184 @@
     while(!(client_connection.queueEmpty())){
       packet = client_connection.getPacket();
-      COUT(5) << "tick gamestate packet size " << packet->dataLength << std::endl;
+      COUT(5) << "tick packet size " << packet->dataLength << std::endl;
       elaborate(packet, 0); // ================= i guess we got to change this .... (client_ID is always same = server)
     }
@@ -203 +203 @@
     if(id!=NULL)
       id->setNetworkID(clid->clid);
-    COUT(4) << "received network id: " << clid->clid << "; classname: " << clid->message << std::endl;
+    COUT(4) << "received and set network id: " << clid->clid << "; classname: " << clid->message << std::endl;
     return;
   }

code/branches/network/src/network/PacketManager.h

@@ -65 +65 @@
     virtual void processGamestate(GameStateCompressed *state);
     virtual void processAck( ack *data, int clientID);
-    void processClassid( classid *cid);
+    virtual void processClassid( classid *cid);
     //virtual void processAck( ack *data);
 

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

@@ -134 +134 @@
     gamestates->update();
     //std::cout << "updated gamestate, sending it" << std::endl;
-    if(clients->getGamestateID()!=GAMESTATEID_INITIAL)
+    //if(clients->getGamestateID()!=GAMESTATEID_INITIAL)
       sendGameState();
     //std::cout << "sent gamestate" << std::endl;
@@ -152 +152 @@
       }
       if( !(temp->getSynched()) ){
-        std::cout << "not sending gamestate" << std::endl;
+        COUT(5) << "not sending gamestate" << std::endl;
         temp=temp->next();
         continue;
       }
-      std::cout << "doing gamestate" << std::endl;
+      COUT(5) << "doing gamestate gamestate preparation" << std::endl;
       int gid = temp->getGamestateID();
       int cid = temp->getID();
-      std::cout << "server, got acked ID: " << gid << std::endl;
+      COUT(5) << "server, got acked (gamestate) ID: " << gid << std::endl;
       GameStateCompressed *gs = gamestates->popGameState(cid);
       if(gs==NULL){
@@ -173 +173 @@
     if(added)
       return connection->sendPackets();
-    COUT(2) << "could not send packets (containing i.e. gamestates)" << std::endl;
+    COUT(5) << "had no gamestates to send" << std::endl;
     return false;
   }