Changeset 10366 in orxonox.OLD for branches/playability.merge/src/world_entities/player.cc
- Timestamp:
- Jan 25, 2007, 12:48:13 PM (18 years ago)
- Location:
- branches/playability.merge
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/playability.merge
- Property svn:ignore
-
old new 10 10 autom4te.cache 11 11 aclocal.m4 12 tags 13 test.bmp 14 config.sub 15 config.guess 16 OrxonoxPlayability.kdevses 17 OrxonoxPlayability.kdevelop.pcs
-
- Property svn:ignore
-
branches/playability.merge/src/world_entities/player.cc
r9869 r10366 16 16 #include "player.h" 17 17 #include "playable.h" 18 #include "space_ships/space_ship.h" 18 19 19 20 #include "event_handler.h" … … 73 74 PRINTF(4)("Enter new Playable\n"); 74 75 this->playable = playable; 75 this->_hud.setEnergyWidget(this->playable->getHealthWidget()); 76 this->_hud.setWeaponManager(&this->playable->getWeaponManager()); 76 this->_hud.setArmorWidget(this->playable->getHealthWidget()); 77 if (dynamic_cast<SpaceShip*>(this->playable) != 0) 78 this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary()); 79 else 80 this->_hud.setWeaponManager(&this->playable->getWeaponManager()); 77 81 78 82 this->playable->setPlayer(this); … … 94 98 void Player::weaponConfigChanged() 95 99 { 96 this->_hud.updateWeaponManager(); 100 //this->_hud.updateWeaponManager(); 101 102 if (dynamic_cast<SpaceShip*>(this->playable) != 0) 103 this->_hud.setWeaponManager(&this->playable->getWeaponManager(), &dynamic_cast<SpaceShip*>(this->playable)->getWeaponManagerSecondary()); 104 else 105 this->_hud.setWeaponManager(&this->playable->getWeaponManager()); 97 106 } 98 107 … … 128 137 } 129 138 139
Note: See TracChangeset
for help on using the changeset viewer.