Changeset 1747 for code/trunk/src/network/packet/Gamestate.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/packet/Gamestate.h (modified) (4 diffs)

code/trunk/src/network/packet/Gamestate.h

@@ -38 +38 @@
 
 namespace packet {
-  
+
 struct GamestateHeader{
   ENUM::Type packetType;
@@ -51 +51 @@
 
 /**
-        @author 
+        @author
 */
 class Gamestate: public Packet{
@@ -57 +57 @@
     Gamestate();
     Gamestate(unsigned char *data, int clientID);
-    
+
     ~Gamestate();
-    
+
     bool collectData(int id, int mode=0x0);
     bool spreadData(int mode=0x0);
@@ -69 +69 @@
     bool compressData();
     bool decompressData();
-    
+
     // Packet functions
     virtual unsigned int getSize() const;
     virtual bool process();
 
-    
+
   private:
     unsigned int calcGamestateSize(int mode=0x0);
-    void removeObject(orxonox::Iterator<Synchronisable> &it);
+    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
 
-    
+
     //Bytestream *bs_;
     //GamestateHeader *header_;