Changeset 6340 in orxonox.OLD for branches/network_merged/src/world_entities/world_entity.h

Timestamp:

Dec 30, 2005, 1:52:26 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/newtork: merged the network branche for merging to the trunk
confilcts maily resolved in favor of trunk with some minor fixes

merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/network . -r6146:HEAD

File:

• branches/network_merged/src/world_entities/world_entity.h (modified) (2 diffs)

branches/network_merged/src/world_entities/world_entity.h

@@ -74 +74 @@
   std::list<WorldEntity*>::iterator& getEntityIterator() { return this->objectListIterator; }
 
+  int       writeState(const byte* data, int length, int sender);
+  int       readState(byte* data, int maxLength );
 
  protected:
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
+
 
  private:
@@ -89 +92 @@
   std::list<WorldEntity*>::iterator objectListIterator; //!< The iterator position of this Entity in the given list of the ObjectManager.
 
+  float                   scaling;
+
+
 };