Changeset 3083 for code/branches/netp3/src/network/packet/Gamestate.cc

Timestamp:

May 26, 2009, 8:11:37 PM (15 years ago)

Author:

scheusso

Message:

some changes/fixes in gamestates and trafficcontrol

File:

• code/branches/netp3/src/network/packet/Gamestate.cc (modified) (4 diffs)

code/branches/netp3/src/network/packet/Gamestate.cc

@@ -182 +182 @@
 #ifndef NDEBUG
   if(this->getID()%1000==0){
-    std::vector<uint32_t> v1;
+    std::list<uint32_t> v1;
     ObjectList<Synchronisable>::iterator it;
     for (it = ObjectList<Synchronisable>::begin(); it != ObjectList<Synchronisable>::end(); ++it) {
@@ -194 +194 @@
       }
       else {
-        std::vector<uint32_t>::iterator it2;
+        std::list<uint32_t>::iterator it2;
         for (it2 = v1.begin(); it2 != v1.end(); ++it2) {
           if (it->getObjectID() == *it2) {
@@ -412 +412 @@
 Gamestate* Gamestate::doSelection(unsigned int clientID, unsigned int targetSize){
   assert(data_);
-  std::vector<obj>::iterator it;
+  std::list<obj>::iterator it;
 
   // allocate memory for new data
@@ -434 +434 @@
 
   //copy in the zeros
+//   std::list<obj>::iterator itt;
+//   COUT(0) << "myvector contains:";
+//   for ( itt=dataVector_.begin() ; itt!=dataVector_.end(); itt++ )
+//     COUT(0) << " " << (*itt).objID;
+//   COUT(0) << endl;
   for(it=dataVector_.begin(); it!=dataVector_.end();){
     SynchronisableHeader oldobjectheader(origdata);