Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9062 in orxonox.OLD for trunk


Ignore:
Timestamp:
Jul 3, 2006, 6:59:18 PM (18 years ago)
Author:
patrick
Message:

merged branche single_player_map back to trunk

Location:
trunk/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/lib/collision_reaction/cr_defs.h

    r9061 r9062  
    3030//!< the collision axis x collision event
    3131#define COLLISION_TYPE_AXIS_X      1
    32 #define COLLISION_TZPE_AXIS_X_NEG  2
     32#define COLLISION_TYPE_AXIS_X_NEG  2
    3333//!< the collision axis y collision event
    3434#define COLLISION_TYPE_AXIS_Y      3
  • trunk/src/world_entities/player.cc

    r9061 r9062  
    7575    PRINTF(4)("Enter new Playable\n");
    7676    this->playable = playable;
    77     this->hud.setEnergyWidget(this->playable->getHealthWidget());
    78     this->hud.setWeaponManager(&this->playable->getWeaponManager());
     77    this->_hud.setEnergyWidget(this->playable->getHealthWidget());
     78    this->_hud.setWeaponManager(&this->playable->getWeaponManager());
    7979
    8080    this->playable->setPlayer(this);
Note: See TracChangeset for help on using the changeset viewer.