Changeset 5965 in orxonox.OLD for branches/powerups/src/world_entities/weapons

Timestamp:

Dec 7, 2005, 3:45:26 PM (19 years ago)

Author:

manuel

Message:

many changes:
created generic weapon_power_up that can contain any kind of weapon
space_ship is now extendable and can pickup weapon_power_ups

File:

• branches/powerups/src/world_entities/weapons/weapon_manager.cc (modified) (1 diff)

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

@@ -408 +408 @@
 
 /**
- * private gets the next free slot in a certain weaponconfig
+ * gets the next free slot in a certain weaponconfig
  * @param the selected weaponconfig
  */
 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(int i = 0; i < WM_MAX_CONFIGS; ++i)
+    {
+      int slot = this->getNextFreeSlot(i, capability);
+      if(slot >= 0) return slot;
+    }
+  }
+  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;
 }