Changeset 6676 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jan 24, 2006, 8:24:48 PM (19 years ago)

Author:

bensch

Message:

trunk: weaponManager works again

Location:

trunk/src/world_entities

Files:

• movie_entity.cc (modified) (1 diff)
• playable.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (5 diffs)

trunk/src/world_entities/movie_entity.cc

@@ -19 +19 @@
 #include "load_param.h"
 #include "factory.h"
-
-#include "network_game_manager.h"
-#include "converter.h"
 
 using namespace std;

trunk/src/world_entities/playable.cc

@@ -52 +52 @@
 void Playable::addWeapon(Weapon* weapon, int configID, int slotID)
 {
-  this->weaponMan->addWeapon(weapon);
+  this->weaponMan->addWeapon(weapon, configID, slotID);
 
   this->weaponConfigChanged();

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -208 +208 @@
   int weaponConf = this->currentConfigID;
   int slot;
-  if (slot = this->getNextFreeSlot(weaponConf, weapon->getCapability()) == -1 )
+  if (slot = this->getNextFreeSlot(weaponConf, weapon->getCapability()) != -1 )
     this->addWeapon(weapon, weaponConf, slot);
+  else
+    this->addWeapon(weapon, -1, -1);
 }
 
@@ -231 +233 @@
   }
 
-  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 (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 (slotID <= -1) // WM_FREE_SLOT
   {
     slotID = this->getNextFreeSlot(configID, weapon->getCapability());
@@ -253 +258 @@
 
   //! @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()));
@@ -259 +266 @@
     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;
 }
@@ -433 +440 @@
 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;