Changeset 5440 in orxonox.OLD for trunk/src/world_entities/weapons/weapon_manager.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/weapons/weapon_manager.cc (modified) (3 diffs)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -220 +220 @@
   if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))
   {
-    PRINTF(2)("Slot %d of config %d is not availiabe\n", slotID, configID);
+    PRINTF(2)("Slot %d of config %d is not availiabe (max: %d)\n", slotID, configID, this->slotCount);
     return;
   }
@@ -238 +238 @@
 
   //! @todo check if the weapon is already assigned to another config in another slot
-
   this->configs[configID][slotID] = weapon;
   if (this->parent != NULL)
@@ -403 +402 @@
  * @param the selected weaponconfig
  */
-int WeaponManager::getNextFreeSlot(int configID)
+int WeaponManager::getNextFreeSlot(int configID, long capability)
 {
   for( int i = 0; i < this->slotCount; ++i)
   {
-    if( this->configs[configID][i] == NULL)
+    if( this->configs[configID][i] == NULL &&
+        (this->currentSlotConfig[i].capability & capability == this->currentSlotConfig[i].capability))
       return i;
   }