Changeset 6693 in orxonox.OLD for branches/network/src/world_entities/weapons/weapon_manager.cc

Timestamp:

Jan 25, 2006, 2:19:46 PM (18 years ago)

Author:

patrick

Message:

branches: removed spaceshipcontrol branche

File:

• branches/network/src/world_entities/weapons/weapon_manager.cc (modified) (3 diffs)

branches/network/src/world_entities/weapons/weapon_manager.cc

@@ -217 +217 @@
 bool WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
 {
+  assert(weapon != NULL);
+
   if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))
   {
-    PRINTF(2)("Slot %d of config %d is not availiabe (max: %d)\n", slotID, configID, this->slotCount);
+    PRINTF(2)("Slot %d of config %d is not availiabe (max: %d) searching for suitable slot\n", slotID, configID, this->slotCount);
+    if (configID >= WM_MAX_CONFIGS)
+      configID = -1;
+    if (slotID >= (int)this->slotCount)
+      slotID = -1;
+  }
+  // if no ConfigID is supplied set to Current Config.
+  if (configID <= -1)
+    configID = this->currentConfigID;
+  //
+  if (configID > -1 && slotID == -1)
+  {
+    slotID = this->getNextFreeSlot(configID, weapon->getCapability());
+    if (slotID == -1)
+      configID = -1;
+  }
+
+  if (configID > 0 && slotID > 0 && this->configs[configID][slotID] != NULL)
+  {
+    PRINTF(3)("Weapon-slot %d/%d of %s already poulated, remove weapon (%s::%s) first\n", configID, slotID, this->getName(), weapon->getClassName(), weapon->getName());
     return false;
   }
 
-  if (this->configs[configID][slotID] != NULL && configID > 0 && slotID > 0)
-    PRINTF(3)("Weapon-slot %d/%d of %s already poulated, overwriting\n", configID, slotID, this->getName());
-
-  if (slotID == -1) // WM_FREE_SLOT
+  if (slotID <= -1) // WM_FREE_SLOT
   {
     slotID = this->getNextFreeSlot(configID, weapon->getCapability());
@@ -245 +263 @@
 
   //! @todo check if the weapon is already assigned to another config in another slot
+  assert(this->configs[configID][slotID] == NULL);
+
   this->configs[configID][slotID] = weapon;
+  weapon->setAmmoContainer(this->getAmmoContainer(weapon->getProjectileType()));
   if (this->parent != NULL)
   {
     this->parent->addChild(weapon);
   }
-  PRINTF(3)("Added a new Weapon to the WeaponManager: config %i/ slot %i\n", configID, slotID);
+  PRINTF(3)("Added a new Weapon (%s::%s) to the WeaponManager: config %i/ slot %i\n", weapon->getClassName(), weapon->getName(), configID, slotID);
   return true;
 }
@@ -420 +441 @@
 /**
  * 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)
 {
-  for( int i = 0; i < this->slotCount; ++i)
-  {
-    if( this->configs[configID][i] == NULL &&
-        (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
-        (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
-      return i;
+  if (configID == -1)
+  {
+    for (configID = 0; configID < WM_MAX_CONFIGS; configID++)
+      for( int i = 0; i < this->slotCount; ++i)
+      {
+        if( this->configs[configID][i] == NULL &&
+            (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
+            (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
+          return i;
+    }
+  }
+  else
+  {
+    for( int i = 0; i < this->slotCount; ++i)
+    {
+      if( this->configs[configID][i] == NULL &&
+          (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
+          (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
+        return i;
+    }
   }
   return -1;
 }
 
+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();
+}