Changeset 324 for code/branches

Timestamp:

Nov 28, 2007, 4:07:13 PM (17 years ago)

Author:

scheusso

Message:

gamestate changes

Location:

code/branches/network/src/network

Files:

• GameStateManager.cc (modified) (1 diff)
• Synchronisable.h (modified) (2 diffs)

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

@@ -90 +90 @@
     if(it->objectID!=sync.objectID){
       // bad luck ;)
+      // delete the synchronisable (obviously seems to be deleted on the server)
+      while(it=!0 && it->objectID!=sync.objectID){
+        it=removeObject(it);
+      }
+      if(it==0){  // add the new object
+        
+      }
     } else {
       // we have our object
       if(! it->updateData(sync))
-        std::cout << "We couldn't update objectID: " << sync.objectID << "; classID: " << sync.classID << std::endl;
+        std::cout << "We couldn't update objectID: " \
+          << sync.objectID << "; classID: " << sync.classID << std::endl;
     }
+    
   }
+  
   
 }
 
-
+/**
+ * This function removes a Synchronisable out of the universe
+ * @param it iterator of the list pointing to the object
+ * @return iterator pointing to the next object in the list
+ */
+Iterator<Synchronisable> removeObject(Iterator<Synchronisable> it){
+  Iterator<Synchronisable> temp=it;
+  it++;
+  delete  temp;
+  return it;
+}
 
 

code/branches/network/src/network/Synchronisable.h

@@ -43 +43 @@
   Synchronisable();
 
-  ~Synchronisable();
+  virtual ~Synchronisable();
   int objectID;
   int classID;
@@ -55 +55 @@
 
 private:
+  bool removeObject(Iterator<Synchronisable> it);
+  
   std::list<SYNCVAR> syncList;
   int datasize;