Changeset 9869 in orxonox.OLD for trunk/src/world_entities/terrain.h

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/terrain.h (modified) (3 diffs)

trunk/src/world_entities/terrain.h

@@ -12 +12 @@
 
 #include "world_entity.h"
-#include "vector.h"
 
 // FORWARD DECLARATION
@@ -26 +25 @@
 class Terrain : public WorldEntity
 {
+  ObjectListDeclaration(Terrain);
 
  public:
@@ -52 +52 @@
  private:
    Model*              vegetation;
-   int                 objectList;
+   int                 modelList;
 
    HeightMap*          heightMap;