Changeset 1294 for code/branches/merge/src

Timestamp:

May 15, 2008, 5:47:22 PM (17 years ago)

Author:

scheusso

Message:

some minor bugfix in something we don't use yet (packetgenerator::command)

Location:

code/branches/merge/src/network

Files:

• GameStateManager.cc (modified) (1 diff)
• PacketGenerator.cc (modified) (1 diff)

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

@@ -427 +427 @@
   void GameStateManager::ackGameState(int clientID, int gamestateID) {
     ClientInformation *temp = head_->findClient(clientID);
+    if(!temp)
+      return;
     int curid = temp->getGamestateID();
     COUT(4) << "acking gamestate " << gamestateID << " for clientid: " << clientID << " curid: " << curid << std::endl;

code/branches/merge/src/network/PacketGenerator.cc

@@ -64 +64 @@
   ENetPacket* command( int dataLength, void *data, int reliable = ENET_PACKET_FLAG_RELIABLE )
   {
-    void *stream = new char[dataLength + 2*sizeof(int)];
+    unsigned char *stream = new unsigned char[dataLength + 2*sizeof(int)];
     if(!stream)
       return NULL;