Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6910 in orxonox.OLD for branches/current_cd


Ignore:
Timestamp:
Jan 31, 2006, 6:18:41 PM (19 years ago)
Author:
patrick
Message:

cd: one conflict overseen

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/current_cd/src/world_entities/world_entity.h

    r6909 r6910  
    8383  void toList(OM_LIST list);
    8484
    85 <<<<<<< .working
     85
    8686  /** @returns a Reference to the objectListNumber to set. */
    8787  OM_LIST& getOMListNumber() { return this->objectListNumber; }
     
    106106  void setHealthMax(float healthMax);
    107107  void createHealthWidget();
    108 =======
    109  protected:
    110   Model*                  model;            //!< The model that should be loaded for this entity.
    111   const BVTree*           obbTree;          //!< this is the obb tree reference needed for collision detection
    112 >>>>>>> .merge-right.r6905
     108
    113109  //  CharacterAttributes*    charAttr;         //!< the character attributes of a world_entity
    114110private:
Note: See TracChangeset for help on using the changeset viewer.