Changeset 2459 for code/branches/presentation/src/network

Timestamp:

Dec 15, 2008, 12:53:05 AM (16 years ago)

Author:

rgrieder

Message:

Merged physics_merge back to presentation branch.

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/network/packet/Gamestate.cc (modified) (1 diff)
• src/network/synchronisable/NetworkCallback.h (modified) (1 prop)
• src/network/synchronisable/NetworkCallbackManager.cc (modified) (1 diff)
• src/network/synchronisable/Synchronisable.cc (modified) (1 prop)
• src/network/synchronisable/Synchronisable.h (modified) (1 prop)

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

@@ -363 +363 @@
   //copy in the zeros
   for(it=dataMap_.begin(); it!=dataMap_.end();){
+//    if((*it).objSize==0)
+//      continue;
     oldobjectheader = (synchronisableHeader*)origdata;
     newobjectheader = (synchronisableHeader*)newdata;

code/branches/presentation/src/network/synchronisable/NetworkCallbackManager.cc

@@ -52 +52 @@
   void NetworkCallbackManager::triggerCallback(NetworkCallbackBase *cb)
   {
-    if (triggeredCallbacks_.front() != cb)
+    if (triggeredCallbacks_.empty() || triggeredCallbacks_.front() != cb)
       triggeredCallbacks_.push(cb);
   }