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

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.h (modified) (4 diffs)

code/trunk/src/network/GamestateClient.h

@@ -42 +42 @@
 
 #include <map>
-// 
+//
 #include "NetworkPrereqs.h"
 #include "core/CorePrereqs.h"
@@ -58 +58 @@
     GamestateClient();
     ~GamestateClient();
-    
+
     bool add(packet::Gamestate *gs, int clientID);
     bool ack(int gamestateID, int clientID);
-    
+
     int processGamestates();
     packet::Gamestate *getGamestate();
@@ -67 +67 @@
   private:
     bool processGamestate(packet::Gamestate *gs);
-    void removeObject(orxonox::Iterator<Synchronisable> &it);
+    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
     void printGamestateMap();
     bool saveShipCache();
@@ -78 +78 @@
     orxonox::SpaceShip *myShip_;
     unsigned char *shipCache_;
-    
+
   };