Changeset 10678 in orxonox.OLD for branches/vs-enhencements/src/world_entities/weapons

Timestamp:

Jun 7, 2007, 5:59:39 PM (18 years ago)

Author:

nicolasc

Message:

xfer

Location:

branches/vs-enhencements/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (4 diffs)
• weapon_manager.h (modified) (1 diff)
• weapon_slot.h (modified) (1 diff)

branches/vs-enhencements/src/world_entities/weapons/weapon_manager.cc

@@ -100 +100 @@
   }
 
-  for (int i = 0; i < WM_MAX_LOADED_WEAPONS; i++)
-    this->availiableWeapons[i] = NULL;
+//   for (int i = 0; i < WM_MAX_LOADED_WEAPONS; i++)
+//     this->availiableWeapons[i] = NULL;
 
 
@@ -287 +287 @@
   }
 
-//   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->getCName(), weapon->getClassCName(), weapon->getCName());
-//     return false;
-//   }
-
-//   if (slotID <= -1) // WM_FREE_SLOT
-//   {
-//     slotID = this->getNextFreeSlot(configID, weapon->getCapability());
-//     if( slotID < 0 || slotID >= this->slotCount)
-//     {
-//       PRINTF(1)("There is no free slot in this WeaponConfig to dock this weapon at! Aborting\n");
-//       return false;
-//     }
-//   }
-
-//   if (!(this->slotConfigs[slotID]->getCapability() & weapon->getCapability() & WTYPE_ALLKINDS) &&
-//       this->slotConfigs[slotID]->getCapability() & weapon->getCapability() & WTYPE_ALLDIRS)
-//   {
-//     PRINTF(2)("Unable to add Weapon with wrong capatibility to Slot %d (W:%d M:%d)\n",
-//               slotID, weapon->getCapability(), this->slotConfigs[slotID]->getCapability());
-//     return false;
-//   }
+  if (configID > 0 && slotID > 0 && this->slotConfigs[slotID]->getWeapon(configID) != NULL)
+  {
+    PRINTF(3)("Weapon-slot %d/%d of %s already poulated, remove weapon (%s::%s) first\n", configID, slotID, this->getCName(), weapon->getClassCName(), weapon->getCName());
+    return false;
+  }
+
+  if (slotID <= -1) // WM_FREE_SLOT
+  {
+    slotID = this->getNextFreeSlot(configID, weapon->getCapability());
+    if( slotID < 0 || slotID >= this->slotCount)
+    {
+      PRINTF(1)("There is no free slot in this WeaponConfig to dock this weapon at! Aborting\n");
+      return false;
+    }
+  }
+
+  if (!(this->slotConfigs[slotID]->getCapability() & weapon->getCapability() & WTYPE_ALLKINDS) &&
+      this->slotConfigs[slotID]->getCapability() & weapon->getCapability() & WTYPE_ALLDIRS)
+  {
+    PRINTF(2)("Unable to add Weapon with wrong capatibility to Slot %d (W:%d M:%d)\n",
+              slotID, weapon->getCapability(), this->slotConfigs[slotID]->getCapability());
+    return false;
+  }
 
   //! @todo check if the weapon is already assigned to another config in another slot
@@ -508 +508 @@
         {
           tickWeapon->toList(OM_NULL);
-          this->slotConfigs[i]->setCurrentWeapon(NULL);
+          this->slotConfigs[i]->setCurrentWeapon(-1);
         }
       }
@@ -530 +530 @@
     }
     else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))
-      this->slotConfigs[i]->setCurrentWeapon(NULL);
+      this->slotConfigs[i]->setCurrentWeapon(-1);
   }
 }

branches/vs-enhencements/src/world_entities/weapons/weapon_manager.h

@@ -125 +125 @@
 //     WeaponSlot*             currentSlotConfig[WM_MAX_SLOTS];          //!< The currentConfigureation.
     WeaponSlot*             slotConfigs[WM_MAX_SLOTS];
-    Weapon*                 availiableWeapons[WM_MAX_LOADED_WEAPONS]; //!< The availiable Weapons of this WeaponSlot
+//     Weapon*                 availiableWeapons[WM_MAX_LOADED_WEAPONS]; //!< The availiable Weapons of this WeaponSlot
 
     bool                    weaponChange;

branches/vs-enhencements/src/world_entities/weapons/weapon_slot.h

@@ -32 +32 @@
 
   inline Weapon* getCurrentWeapon() { return this->currentWeapon; }
-  inline void setCurrentWeapon(int config) { this->currentWeapon = this->configs[config]; }
+  inline void setCurrentWeapon(int config) { config == -1 ? this->currentWeapon = NULL: this->currentWeapon = this->configs[config]; }
 
   inline Weapon* getNextWeapon() { return this->nextWeapon; }
-  inline void setNextWeapon(int config) { if (config == -1) this->nextWeapon = NULL; else this->nextWeapon = configs[config]; }
+  inline void setNextWeapon(int config) { config == -1 ? this->nextWeapon = NULL : this->nextWeapon = configs[config]; }
 
   inline void setNextToCurrent() {this->currentWeapon = this->nextWeapon; };