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

Timestamp:

Dec 30, 2005, 1:52:26 AM (19 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/terrain.h (modified) (2 diffs)

branches/network_merged/src/world_entities/terrain.h

@@ -30 +30 @@
   virtual ~Terrain();
 
+  virtual int       writeBytes(const byte* data, int length, int sender);
+  virtual int       readBytes(byte* data, int maxLength, int * reciever);
+  virtual void      writeDebug() const;
+  virtual void      readDebug() const;
+
   void init();
   void loadParams(const TiXmlElement* root);
@@ -44 +49 @@
    Model*              vegetation;
    int                 objectList;
+
 };