Changeset 894

Timestamp:

Mar 13, 2008, 4:16:02 PM (17 years ago)

Author:

scheusso

Message:

added more bugfixing and debug output

Location:

code/branches/network/src/network

Files:

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

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

@@ -65 +65 @@
   }
 
-  GameStateCompressed GameStateManager::popGameState(int clientID) {
+  GameStateCompressed *GameStateManager::popGameState(int clientID) {
     int gID = head_->findClient(clientID)->getGamestateID();
     COUT(4) << "popgamestate: sending gstate id: " << id << "diffed from: " << gID << std::endl;
@@ -72 +72 @@
       GameState *server = reference;
       //head_->findClient(clientID)->setGamestateID(id);
-      return *encode(client, server);
+      return encode(client, server);
     } else {
       GameState *server = reference;
       //head_->findClient(clientID)->setGamestateID(id);
-      return *encode(server);
+      return encode(server);
       // return an undiffed gamestate and set appropriate flags
     }

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

@@ -43 +43 @@
     ~GameStateManager();
     void update();
-    GameStateCompressed popGameState(int clientID);
+    GameStateCompressed *popGameState(int clientID);
     void ackGameState(int clientID, int gamestateID);
     int id;

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

@@ -134 +134 @@
     gamestates->update();
     //std::cout << "updated gamestate, sending it" << std::endl;
-    sendGameState();
+    if(clients->getGamestateID()!=GAMESTATEID_INITIAL)
+      sendGameState();
     //std::cout << "sent gamestate" << std::endl;
   }
@@ -142 +143 @@
   */
   bool Server::sendGameState() {
-    std::cout << "starting gamestate" << std::endl;
+    COUT(5) << "starting sendGameState" << std::endl;
     ClientInformation *temp = clients;
     bool added=false;
@@ -159 +160 @@
       int cid = temp->getID();
       std::cout << "server, got acked ID: " << gid << std::endl;
-      GameStateCompressed *gs = &(gamestates->popGameState(cid)); // FIXME: taking address of temporary, check if correct
+      GameStateCompressed *gs = gamestates->popGameState(cid);
+      if(gs==NULL){
+        COUT(2) << "could not generate gamestate" << std::endl;
+        return false;
+      }
       //std::cout << "adding gamestate" << std::endl;
       connection->addPacket(packet_gen.gstate(gs), cid);
@@ -168 +173 @@
     if(added)
       return connection->sendPackets();
-    else
-      return false;
+    COUT(2) << "could not send packets (containing i.e. gamestates)" << std::endl;
+    return false;
   }