Changeset 1752 for code/trunk/src/network/packet

Timestamp:

Sep 9, 2008, 8:28:24 PM (16 years ago)

Author:

landauf

Message:

• removed #include "core/CoreIncludes.h" from Gamestate.h and put it into the .cc files
• removed a warning in Client.cc

Location:

code/trunk/src/network/packet

Files:

• Gamestate.cc (modified) (3 diffs)
• Gamestate.h (modified) (2 diffs)

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

@@ -30 +30 @@
 #include "network/ClientInformation.h"
 #include "network/GamestateHandler.h"
+#include "core/CoreIncludes.h"
 #include "core/Iterator.h"
 
@@ -267 +268 @@
   assert(HEADER->crc32==calcCRC(ndata+sizeof(GamestateHeader), HEADER->normsize));
 #endif
-  
+
   //copy over the header
   *GAMESTATE_HEADER(ndata) = *HEADER;
@@ -386 +387 @@
     return HEADER->compressed;
   }
-  
+
   int Gamestate::getBaseID(){
     return HEADER->base_id;

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

@@ -32 +32 @@
 #include "util/CRC32.h"
 #endif
-#include "core/CoreIncludes.h"
 
 #ifndef NETWORK_PACKETGAMESTATE_H
@@ -83 +82 @@
   private:
     unsigned int calcGamestateSize(unsigned int id, int mode=0x0);
-    void removeObject(orxonox::ObjectList<Synchronisable>::iterator &it);
+    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);