Changeset 9667 for code/trunk/src/libraries/network/packet

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/network/packet/ClassID.cc (modified) (2 diffs)
• src/libraries/network/packet/FunctionIDs.cc (modified) (1 diff)
• src/libraries/network/packet/Gamestate.cc (modified) (3 diffs)

code/trunk/src/libraries/network/packet/ClassID.cc

@@ -55 +55 @@
 
   //calculate total needed size (for all strings and integers)
-  std::map<std::string, Identifier*>::const_iterator it = Identifier::getStringIdentifierMapBegin();
-  for(;it != Identifier::getStringIdentifierMapEnd();++it){
+  std::map<std::string, Identifier*>::const_iterator it = IdentifierManager::getInstance().getIdentifierByStringMap().begin();
+  for(;it != IdentifierManager::getInstance().getIdentifierByStringMap().end();++it){
     id = it->second;
     if(id == NULL || !id->hasFactory())
@@ -129 +129 @@
 
   //clear the map of network ids
-  Identifier::clearNetworkIDs();
+  IdentifierManager::getInstance().clearNetworkIDs();
 
   orxout(verbose, context::packets) << "=== processing classids: " << endl;

code/trunk/src/libraries/network/packet/FunctionIDs.cc

@@ -35 +35 @@
 
 #include "util/Output.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 #include "network/NetworkFunction.h"
 

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

@@ -33 +33 @@
 #include "util/Output.h"
 #include "util/OrxAssert.h"
+#include "core/CoreIncludes.h"
 #include "core/GameMode.h"
-#include "core/ObjectList.h"
+#include "core/object/ObjectList.h"
 #include "network/synchronisable/Synchronisable.h"
 #include "network/GamestateHandler.h"
@@ -132 +133 @@
     tempsize = it->getData(mem, this->sizes_, id, mode);
     if ( tempsize != 0 )
-      dataVector_.push_back( obj(it->getObjectID(), it->getCreatorID(), tempsize, mem-data_) );
+      dataVector_.push_back( obj(it->getObjectID(), it->getContextID(), tempsize, mem-data_) );
 
 #ifndef NDEBUG
@@ -468 +469 @@
     {
       assert( objectHeader.getClassID() == htemp.getClassID() );
-      assert( objectHeader.getCreatorID() == htemp.getCreatorID() );
+      assert( objectHeader.getContextID() == htemp.getContextID() );
       return true;
     }