Changeset 6341 in orxonox.OLD for trunk/src/world_entities/world_entity.h

Timestamp:

Dec 30, 2005, 1:57:12 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network branche back to the trunk, so we do not get away from each other to fast

File:

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

trunk/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;
+
+
 };