Changeset 5441 in orxonox.OLD

Timestamp:

Oct 27, 2005, 11:46:46 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Weapons update, Now one can really assign SlotCapabilities and they are used and checked

Location:

trunk/src/world_entities

Files:

• player.cc (modified) (1 diff)
• weapons/test_gun.cc (modified) (1 diff)
• weapons/turret.cc (modified) (1 diff)
• weapons/weapon.cc (modified) (1 diff)
• weapons/weapon.h (modified) (2 diffs)
• weapons/weapon_manager.cc (modified) (2 diffs)

trunk/src/world_entities/player.cc

@@ -136 +136 @@
 
   this->weaponMan->setSlotPosition(0, Vector(-2.6, .1, -3.0));
-  this->weaponMan->setSlotCapability(0, WTYPE_ALLDIRS & WTYPE_DIRECTIONAL);
+  this->weaponMan->setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
   this->weaponMan->setSlotPosition(1, Vector(-2.6, .1, 3.0));
-  this->weaponMan->setSlotCapability(1, WTYPE_ALLDIRS & WTYPE_DIRECTIONAL);
+  this->weaponMan->setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
   this->weaponMan->setSlotPosition(2, Vector(-1.5, .5, -.5));

trunk/src/world_entities/weapons/test_gun.cc

@@ -134 +134 @@
   this->setActionSound(WA_SHOOT, "sound/shot1.wav");
 
+  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
   this->setProjectileType(CL_TEST_BULLET);
   this->prepareProjectiles(20);

trunk/src/world_entities/weapons/turret.cc

@@ -91 +91 @@
   //this->minCharge = 2;
 
-
+  this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET);
   this->setProjectileType(CL_TEST_BULLET);
 

trunk/src/world_entities/weapons/weapon.cc

@@ -94 +94 @@
   this->energy = .0;
   this->energyMax = 10.0;
+  this->capability = WTYPE_ALL;
 
   this->setWeaponManager(NULL);

trunk/src/world_entities/weapons/weapon.h

@@ -106 +106 @@
 
     // FUNCTIONS TO SET THE WEAPONS PROPERTIES.
+    /** sets the Weapons Capabilities */
+    inline void setCapability(long capabilities) { this->capability = capabilities; };
+    /** @returns the Capabilities of this Weapon */
+    inline long getCapability() { return this->capability; };
     void setProjectileType(ClassID projectile);
     void setProjectileType(const char* projectile);
@@ -185 +189 @@
 
   private:
+    // type of Weapon
+    long                 capability;                       //!< what capabilities the Weapon has @see W_Capability
+
     // it is all about energy
     float                energy;                           //!< The energy stored in the weapons secondary buffers (reserve)

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -229 +229 @@
   if (slotID == -1) // WM_FREE_SLOT
   {
-    slotID = this->getNextFreeSlot(configID);
+    slotID = this->getNextFreeSlot(configID, weapon->getCapability());
     if( slotID < 0 || slotID >= this->slotCount)
     {
-      PRINTF(0)("There is no free slot in this WeaponConfig to dock this weapon at! Aborting\n");
+      PRINTF(1)("There is no free slot in this WeaponConfig to dock this weapon at! Aborting\n");
       return;
     }
+  }
+
+  if (!(this->currentSlotConfig[slotID].capability & weapon->getCapability() & WTYPE_ALLKINDS) &&
+        this->currentSlotConfig[slotID].capability & 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->currentSlotConfig[slotID].capability);
+    return;
   }
 
@@ -407 +415 @@
   {
     if( this->configs[configID][i] == NULL &&
-        (this->currentSlotConfig[i].capability & capability == this->currentSlotConfig[i].capability))
+        (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
+        (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
       return i;
   }