Changeset 8403 for code/trunk

Timestamp:

May 5, 2011, 4:02:40 PM (14 years ago)

Author:

scheusso

Message:

fixing possible bug with packet ordering

Location:

code/trunk/src/libraries/network

Files:

• FunctionCallManager.cc (modified) (2 diffs)
• Host.cc (modified) (1 diff)
• Host.h (modified) (1 diff)

code/trunk/src/libraries/network/FunctionCallManager.cc

@@ -31 +31 @@
 #include "core/GameMode.h"
 #include "GamestateHandler.h"
+#include "Host.h"
+#include "util/OrxAssert.h"
 
 namespace orxonox {
@@ -175 +177 @@
   while( it!=FunctionCallManager::sIncomingFunctionCallBuffer_.end() )
   {
-    if( it->first.execute() )
+    OrxAssert( Host::getActiveInstance(), "No Host class existing" );
+    if( it->second.first <= Host::getActiveInstance()->getLastReceivedGamestateID(it->second.second) && it->first.execute() )
       FunctionCallManager::sIncomingFunctionCallBuffer_.erase(it);
     else

code/trunk/src/libraries/network/Host.cc

@@ -161 +161 @@
     return false;
   }
+  
+  Host* Host::getActiveInstance()
+  {
+    std::vector<Host*>::iterator it = Host::instances_s.begin();
+    while( it != Host::instances_s.end() )
+    {
+      if( (*it)->isActive() )
+        return *it;
+    }
+    return 0;
+  }
+
 
 }//namespace orxonox

code/trunk/src/libraries/network/Host.h

@@ -71 +71 @@
 
   public:
-//     static Host* getInstance(){ return instance_; }
+    static Host* getActiveInstance();
     static bool running(){ return instances_s.size(); }
     static void addPacket(ENetPacket* packet, int clientID = NETWORK_PEER_ID_SERVER, uint8_t channelID = 0);