Changeset 1747 for code/trunk/src/network/GamestateClient.cc

Timestamp:

Sep 9, 2008, 4:25:52 AM (17 years ago)

Author:

landauf

Message:

merged core3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/network/GamestateClient.cc (modified) (3 diffs)

code/trunk/src/network/GamestateClient.cc

@@ -33 +33 @@
 #include "core/CoreIncludes.h"
 #include "core/BaseObject.h"
+#include "core/Iterator.h"
 #include "Synchronisable.h"
 
@@ -68 +69 @@
     return true;
   }
-  
+
   int GamestateClient::processGamestates(){
     if(tempGamestate_==NULL)
@@ -89 +90 @@
   * @return iterator pointing to the next object in the list
   */
-  void GamestateClient::removeObject(orxonox::Iterator<Synchronisable> &it) {
-    orxonox::Iterator<Synchronisable> temp=it;
+  void GamestateClient::removeObject(orxonox::ObjectList<Synchronisable>::iterator &it) {
+    orxonox::ObjectList<Synchronisable>::iterator temp=it;
     ++it;
     delete  *temp;