Changeset 6679 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jan 24, 2006, 10:56:46 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: WeaponManager seems to work, better than before.

Location:

trunk/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (2 diffs)
• weapon_manager.h (modified) (1 diff)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -203 +203 @@
 }
 
-
-bool WeaponManager::addWeapon(Weapon* weapon)
-{
-  int weaponConf = this->currentConfigID;
-  int slot = this->getNextFreeSlot(weaponConf, weapon->getCapability());
-  if (slot  != -1 )
-  {
-    return this->addWeapon(weapon, weaponConf, slot);
-  }
-  else
-  {
-    return this->addWeapon(weapon, -1, -1);
-  }
-}
 
 /**
@@ -231 +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);
-    return false;
+    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;
   }
 

trunk/src/world_entities/weapons/weapon_manager.h

@@ -74 +74 @@
     PNode* getParent() const { return this->parent; };
 
-    bool addWeapon(Weapon* weapon);
-    bool addWeapon(Weapon* weapon, int configID, int slotID = -1);
+    bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);