Changeset 6910 in orxonox.OLD for branches/current_cd/src

Timestamp:

Jan 31, 2006, 6:18:41 PM (19 years ago)

Author:

patrick

Message:

cd: one conflict overseen

File:

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

branches/current_cd/src/world_entities/world_entity.h

@@ -83 +83 @@
   void toList(OM_LIST list);
 
-<<<<<<< .working
+
   /** @returns a Reference to the objectListNumber to set. */
   OM_LIST& getOMListNumber() { return this->objectListNumber; }
@@ -106 +106 @@
   void setHealthMax(float healthMax);
   void createHealthWidget();
-=======
- protected:
-  Model*                  model;            //!< The model that should be loaded for this entity.
-  const BVTree*           obbTree;          //!< this is the obb tree reference needed for collision detection
->>>>>>> .merge-right.r6905
+
   //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
 private: