Changeset 2351 for code/branches/network/src/network/packet/Gamestate.h

Timestamp:

Dec 7, 2008, 10:57:09 PM (15 years ago)

Author:

scheusso

Message:

some changes. still not working yet, but will correct theese problems after merge with network64

File:

• code/branches/network/src/network/packet/Gamestate.h (modified) (3 diffs)

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

@@ -35 +35 @@
 #include "Packet.h"
 #include "network/Synchronisable.h"
+#include "network/TrafficControl.h"
 #include <map>
+#include <vector>
 #ifndef NDEBUG
 #include "util/CRC32.h"
@@ -79 +81 @@
     Gamestate *undiff(Gamestate *base);
     Gamestate* intelligentUnDiff(Gamestate *base);
-    Gamestate* doSelection(unsigned int clientID);
+    Gamestate* doSelection(unsigned int clientID, unsigned int targetSize);
     bool compressData();
     bool decompressData();
@@ -92 +94 @@
     unsigned int calcGamestateSize(unsigned int id, int mode=0x0);
     void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
-    std::map<unsigned int, Synchronisable*> dataMap_;
+    std::vector<obj> dataMap_;
 };