Changeset 2532 for code/branches/bugger/src/network/packet

Timestamp:

Dec 23, 2008, 11:15:09 PM (16 years ago)

Author:

rgrieder

Message:

Merged revisions 2377-2382 to bugger from presentation.

Location:

code/branches/bugger/src/network/packet

Files:

• Gamestate.cc (modified) (2 diffs)
• Gamestate.h (modified) (1 diff)

code/branches/bugger/src/network/packet/Gamestate.cc

@@ -50 +50 @@
 
 #define PACKET_FLAG_GAMESTATE  ENET_PACKET_FLAG_RELIABLE
-  
-TrafficControl Gamestate::trafficControl_;
 
 Gamestate::Gamestate()
@@ -362 +360 @@
 
   //call TrafficControl
-  trafficControl_.processObjectList( clientID, HEADER->id, &dataMap_ );
+  TrafficControl::getInstance()->processObjectList( clientID, HEADER->id, &dataMap_ );
   
   //copy in the zeros

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

@@ -95 +95 @@
     void removeObject(ObjectListIterator<Synchronisable> &it);
     std::list<obj> dataMap_;
-    static TrafficControl trafficControl_;
+//     static TrafficControl *trafficControl_;
 };