Changeset 6669 in orxonox.OLD for trunk/src/world_entities/weapons/weapon_manager.cc

Timestamp:

Jan 24, 2006, 2:26:15 PM (18 years ago)

Author:

bensch

Message:

some WeaponManager remake

File:

• trunk/src/world_entities/weapons/weapon_manager.cc (modified) (4 diffs)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -203 +203 @@
 }
 
+
+bool WeaponManager::addWeapon(Weapon* weapon)
+{
+  int weaponConf = this->currentConfigID;
+  int slot;
+  if (slot = this->getNextFreeSlot(weaponConf, weapon->getCapability()) == -1 )
+    this->addWeapon(weapon, weaponConf, slot);
+}
 
 /**
@@ -246 +254 @@
   //! @todo check if the weapon is already assigned to another config in another slot
   this->configs[configID][slotID] = weapon;
+  weapon->setAmmoContainer(this->getAmmoContainer(weapon->getProjectileType()));
   if (this->parent != NULL)
   {
@@ -420 +429 @@
 /**
  * private gets the next free slot in a certain weaponconfig
- * @param the selected weaponconfig
+ * @param the selected weaponconfig -1 if none found
  */
 int WeaponManager::getNextFreeSlot(int configID, long capability)
@@ -434 +443 @@
 }
 
+CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(ClassID projectileType)
+{
+  for (unsigned int i = 0; i < this->ammo.size(); i++)
+  {
+    if (this->ammo[i]->getProjectileType() == projectileType)
+      return this->ammo[i];
+  }
+  this->ammo.push_back(CountPointer<AmmoContainer>(new AmmoContainer(projectileType)));
+  return this->ammo.back();
+}