Changeset 3084 for code/trunk/src/network/packet/Gamestate.h

Timestamp:

May 26, 2009, 9:20:57 PM (16 years ago)

Author:

landauf

Message:

merged netp3 branch 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

@@ -21 +21 @@
  *
  *   Author:
- *      Oliver Scheuss, (C) 2008
+ *      Oliver Scheuss
  *   Co-authors:
  *      ...
@@ -37 +37 @@
 #include <string.h>
 #include <map>
-#include <list>
+#include <vector>
 #include <cassert>
 #ifndef NDEBUG
@@ -120 +120 @@
     bool compressData();
     bool decompressData();
+    bool operator ==(packet::Gamestate gs);
 
     // Packet functions
@@ -126 +127 @@
     virtual inline bool process();
 
-    bool operator ==(packet::Gamestate gs);
   private:
     uint32_t calcGamestateSize(int32_t id, uint8_t mode=0x0);
-    std::list<obj> dataMap_;
+    std::list<obj> dataVector_;
     GamestateHeader* header_;
 };