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

Timestamp:

Apr 6, 2009, 1:59:00 AM (16 years ago)

Author:

landauf

Message:

Merged gui branch back to trunk.

I did 2 small changes in IngameManager.cc on line 777 and 888 (yes, really), because const_reverse_iterator strangely doesn't work on MinGW.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/network/packet/Gamestate.cc (modified) (2 diffs)
• src/network/packet/Gamestate.h (modified) (1 diff)

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

@@ -34 +34 @@
 #include "../synchronisable/Synchronisable.h"
 #include "../TrafficControl.h"
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/Iterator.h"
@@ -162 +162 @@
     if(!s)
     {
-      if (!Core::isMaster())
+      if (!GameMode::isMaster())
       {
         Synchronisable::fabricate(mem, mode);

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

@@ -35 +35 @@
 #include "Packet.h"
 #include "network/TrafficControl.h"
-#include "core/CoreIncludes.h"
+#include <string.h>
 #include <map>
 #include <list>
+#include <cassert>
 #ifndef NDEBUG
 #include "util/CRC32.h"