Changeset 2485 for code/branches/presentation/src/network/packet/Gamestate.cc

Timestamp:

Dec 16, 2008, 6:01:13 PM (16 years ago)

Author:

landauf

Message:

Merged objecthierarchy2 into presentation branch

Couln't merge 2 lines in Gamestate.cc and a whole block of code in GSDedicated.cc (it seems like oli implemented in both branches something like a network-tick-limiter but with different approaches)

Not yet tested in network mode and with bots
The SpaceShips movement is also not yet fully adopted to the new physics (see Engine class)

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• src/network/packet/Gamestate.cc (modified) (4 diffs)

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

@@ -31 +31 @@
 #include "../synchronisable/Synchronisable.h"
 #include "../TrafficControl.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/Iterator.h"
@@ -151 +152 @@
     if(!s)
     {
-      Synchronisable::fabricate(mem, mode);
+      if (!Core::isMaster())
+        Synchronisable::fabricate(mem, mode);
+      else
+        mem += objectheader->size;
 //         COUT(0) << "could not fabricate synchronisable: " << objectheader->objectID << " classid: " << objectheader->classID << " creator: " << objectheader->creatorID << endl;
 //       else
@@ -170 +174 @@
       if (it->objectMode_ != 0x0) {
         COUT(0) << "Found object with OBJECTID_UNKNOWN on the client with objectMode != 0x0!" << std::endl;
+        COUT(0) << "Possible reason for this error: Client created a synchronized object without the Server's approval." << std::endl;
         assert(false);
       }
@@ -384 +389 @@
   //call TrafficControl
   TrafficControl::getInstance()->processObjectList( clientID, HEADER->id, &dataMap_ );
-  
+
   //copy in the zeros
   for(it=dataMap_.begin(); it!=dataMap_.end();){
 //    if((*it).objSize==0)
 //      continue;
+//    if(it->second->getSize(HEADER->id)==0) // merged from objecthierarchy2, doesn't work anymore; TODO: change this
+//      continue;                            // merged from objecthierarchy2, doesn't work anymore; TODO: change this
     oldobjectheader = (synchronisableHeader*)origdata;
     newobjectheader = (synchronisableHeader*)newdata;