Changeset 7780 for code/branches/network5/src/libraries/network/packet

Timestamp:

Dec 19, 2010, 9:41:57 PM (15 years ago)

Author:

scheusso

Message:

some fixes
reactivating acking and gamestate diffing

Location:

code/branches/network5/src/libraries/network/packet

Files:

• FunctionCalls.cc (modified) (1 diff)
• Packet.cc (modified) (1 diff)

code/branches/network5/src/libraries/network/packet/FunctionCalls.cc

@@ -71 +71 @@
     FunctionCall fctCall;
     fctCall.loadData(temp);
-    if( this->minGamestateID_ > host->getLastProcessedGamestateID(this->getPeerID()) || !fctCall.execute() )
+    if( !fctCall.execute() )
     {
       FunctionCallManager::bufferIncomingFunctionCall( fctCall, minGamestateID_, this->getPeerID() );

code/branches/network5/src/libraries/network/packet/Packet.cc

@@ -179 +179 @@
   assert(ClientInformation::findClient(&peer->address)->getID() != static_cast<unsigned int>(-2) || !Host::isServer());
   unsigned int peerID = ClientInformation::findClient(&peer->address)->getID();
+  // HACK
+  if( peerID==static_cast<unsigned int>(-2))
+    peerID = NETWORK_PEER_ID_SERVER;
   Packet *p = 0;
 //   COUT(6) << "packet type: " << *(Type::Value *)&data[_PACKETID] << std::endl;