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

Timestamp:

Oct 27, 2005, 10:56:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Weapons update, Now one can really assign SlotCapabilities
Debug-redesign (small)

File:

• trunk/src/world_entities/player.cc (modified) (3 diffs)

trunk/src/world_entities/player.cc

@@ -136 +136 @@
 
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
+  this->weaponMan->setSlotCapability(0, WTYPE_ALLDIRS & WTYPE_DIRECTIONAL);
 
   this->weaponMan->setSlotPosition(1, Vector(-2.6, .1, 3.0));
+  this->weaponMan->setSlotCapability(1, WTYPE_ALLDIRS & WTYPE_DIRECTIONAL);
 
   this->weaponMan->setSlotPosition(2, Vector(-1.5, .5, -.5));
@@ -329 +331 @@
 
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-int slot = 2;
 void Player::ADDWEAPON()
 {
@@ -336 +337 @@
   turret1->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
 
-  this->weaponMan->addWeapon(turret1, 2, slot++);
+  this->weaponMan->addWeapon(turret1, 2);
 
   this->weaponMan->changeWeaponConfig(2);