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

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.h (modified) (2 diffs)

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

@@ -28 +28 @@
 
 
-#ifndef NETWORK_PACKETGAMESTATE_H
-#define NETWORK_PACKETGAMESTATE_H
+#ifndef _Gamestate_H__
+#define _Gamestate_H__
 
 #include "network/NetworkPrereqs.h"
 
+#include <cassert>
+#include <cstring>
+#include <list>
+
+#include "util/CRC32.h"
+#include "network/TrafficControl.h"
 #include "Packet.h"
-#include "network/TrafficControl.h"
-#include <string.h>
-#include <map>
-#include <vector>
-#include <cassert>
-#ifndef NDEBUG
-#include "util/CRC32.h"
-#endif
 
 namespace orxonox {
@@ -138 +136 @@
 }
 
-#endif
+#endif /* _Gamestate_H__ */