Changeset 2945 for code/branches/netp2/src/network

Timestamp:

May 1, 2009, 3:16:12 PM (16 years ago)

Author:

scheusso

Message:

fixed some bugs

Location:

code/branches/netp2/src/network

Files:

• FunctionCallManager.cc (modified) (3 diffs)
• packet/FunctionCalls.cc (modified) (1 diff)

code/branches/netp2/src/network/FunctionCallManager.cc

@@ -35 +35 @@
 
 void FunctionCallManager::addCallStatic(uint32_t functionID, uint32_t clientID, MultiType* mt1, MultiType* mt2, MultiType* mt3, MultiType* mt4, MultiType* mt5)
-{ 
+{  
   if(clientMap_.find(clientID)==clientMap_.end()) 
   {
-    clientMap_[clientID] = new packet::FunctionCalls; 
-    clientMap_[clientID]->setClientID(clientID); 
+    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
+    FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
   } 
-  clientMap_[clientID]->addCallStatic(functionID, mt1, mt2, mt3, mt4, mt5);
+  FunctionCallManager:: clientMap_[clientID]->addCallStatic(functionID, mt1, mt2, mt3, mt4, mt5);
 }
 
@@ -48 +48 @@
   if(clientMap_.find(clientID)==clientMap_.end()) 
   {
-    clientMap_[clientID] = new packet::FunctionCalls; 
-    clientMap_[clientID]->setClientID(clientID); 
+    FunctionCallManager::clientMap_[clientID] = new packet::FunctionCalls; 
+    FunctionCallManager::clientMap_[clientID]->setClientID(clientID); 
   } 
-  clientMap_[clientID]->addCallMember(functionID, objectID, mt1, mt2, mt3, mt4, mt5);
+  FunctionCallManager::clientMap_[clientID]->addCallMember(functionID, objectID, mt1, mt2, mt3, mt4, mt5);
 }
 
@@ -57 +57 @@
 {
   std::map<uint32_t, packet::FunctionCalls*>::iterator it;
-  for (it = FunctionCallManager::clientMap_.begin(); it != FunctionCallManager::clientMap_.end(); )
+  for (it = FunctionCallManager::clientMap_.begin(); it != FunctionCallManager::clientMap_.end(); it++ )
   {
+    assert(!FunctionCallManager::clientMap_.empty());
     it->second->send();
-    clientMap_.erase(it++);
   }
+  FunctionCallManager::clientMap_.clear();
 }
 

code/branches/netp2/src/network/packet/FunctionCalls.cc

@@ -52 +52 @@
   data_=new uint8_t[ FUNCTIONCALLS_MEM_ALLOCATION ];
   *(ENUM::Type *)(data_ + _PACKETID ) = ENUM::FunctionCalls;
+  *(uint32_t*)(data_+sizeof(uint32_t)) = 0; // set nrOfCalls to 0
 }