Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/world_entity.h

Timestamp:

Mar 1, 2005, 9:50:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/world_entity.h (modified) (2 diffs)

orxonox/branches/trackManager/src/world_entity.h

@@ -11 +11 @@
 
 class CollisionCluster;
-class Model;
+class OBJModel;
 
 //! Basic class from which all interactive stuff in the world is derived from
@@ -22 +22 @@
   virtual ~WorldEntity ();
 
-  Model* model;
+  OBJModel* model;
   
   void setCollision (CollisionCluster* newhull);