Changeset 9667 for code/trunk/src/libraries/network/packet/Gamestate.cc
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (12 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/network/packet/Gamestate.cc
r8952 r9667 33 33 #include "util/Output.h" 34 34 #include "util/OrxAssert.h" 35 #include "core/CoreIncludes.h" 35 36 #include "core/GameMode.h" 36 #include "core/ ObjectList.h"37 #include "core/object/ObjectList.h" 37 38 #include "network/synchronisable/Synchronisable.h" 38 39 #include "network/GamestateHandler.h" … … 132 133 tempsize = it->getData(mem, this->sizes_, id, mode); 133 134 if ( tempsize != 0 ) 134 dataVector_.push_back( obj(it->getObjectID(), it->getC reatorID(), tempsize, mem-data_) );135 dataVector_.push_back( obj(it->getObjectID(), it->getContextID(), tempsize, mem-data_) ); 135 136 136 137 #ifndef NDEBUG … … 468 469 { 469 470 assert( objectHeader.getClassID() == htemp.getClassID() ); 470 assert( objectHeader.getC reatorID() == htemp.getCreatorID() );471 assert( objectHeader.getContextID() == htemp.getContextID() ); 471 472 return true; 472 473 }
Note: See TracChangeset
for help on using the changeset viewer.