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

Timestamp:

Sep 9, 2008, 4:31:34 PM (16 years ago)

Author:

scheusso

Message:

merged network branch back into trunk

File:

• code/trunk/src/network/GamestateClient.h (modified) (1 diff)

code/trunk/src/network/GamestateClient.h

@@ -66 +66 @@
     void cleanup();
   private:
-    bool processGamestate(packet::Gamestate *gs);
-    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
+    packet::Gamestate *processGamestate(packet::Gamestate *gs);
+    void removeObject(orxonox::ObjectList<Synchronisable>::iterator &it);
     void printGamestateMap();
     bool saveShipCache();