Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 4261 in orxonox.OLD for orxonox/trunk/src/world_entities/player.cc


Ignore:
Timestamp:
May 22, 2005, 3:19:57 AM (20 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the levelLoader-branche back into the trunk, because it seems to be stable.
merged with command:
svn merge -r 4230:HEAD levelLoader ../trunk
no conflicts of any interesst

File:
1 edited

Legend:

Unmodified
Added
Removed
  • orxonox/trunk/src/world_entities/player.cc

    r4114 r4261  
    8080   \todo add more parameters to load
    8181*/
    82 Player::Player(TiXmlElement* root) : WorldEntity(root)
     82Player::Player(const TiXmlElement* root) : WorldEntity(root)
    8383{
    8484  this->weapons = new tList<Weapon>();
Note: See TracChangeset for help on using the changeset viewer.