Changeset 3214 for code/trunk/src/network/packet/Gamestate.cc

Timestamp:

Jun 23, 2009, 6:02:25 PM (15 years ago)

Author:

scheusso

Message:

merged netp5 back to trunk

File:

• code/trunk/src/network/packet/Gamestate.cc (modified) (2 diffs)

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

@@ -28 +28 @@
 
 #include "Gamestate.h"
-#include <enet/enet.h>
+
 #include <zlib.h>
-#include <cassert>
-#include "../GamestateHandler.h"
-#include "../synchronisable/Synchronisable.h"
-#include "../TrafficControl.h"
+
+#include "util/Debug.h"
 #include "core/GameMode.h"
-#include "core/CoreIncludes.h"
-
-
-
+#include "core/ObjectList.h"
+#include "network/synchronisable/Synchronisable.h"
+#include "network/GamestateHandler.h"
 
 namespace orxonox {
@@ -46 +43 @@
 #define GAMESTATE_START(data) (data + GamestateHeader::getSize())
 
-#define PACKET_FLAG_GAMESTATE  ENET_PACKET_FLAG_RELIABLE
+#define PACKET_FLAG_GAMESTATE  PacketFlag::Reliable