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

Timestamp:

Oct 27, 2005, 10:56:58 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Weapons update, Now one can really assign SlotCapabilities
Debug-redesign (small)

Location:

trunk/src/world_entities

Files:

• player.cc (modified) (3 diffs)
• weapons/turret.cc (modified) (3 diffs)
• weapons/weapon_manager.cc (modified) (3 diffs)
• weapons/weapon_manager.h (modified) (1 diff)

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->setSlotPosition(1, Vector(-2.6, .1, 3.0));
+  this->weaponMan->setSlotCapability(1, WTYPE_ALLDIRS & WTYPE_DIRECTIONAL);
 
   this->weaponMan->setSlotPosition(2, Vector(-1.5, .5, -.5));
@@ -329 +331 @@
 
 // FIXME THIS MIGHT BE CONSIDERED EITHER A FEATURE, OR A BUG
-int slot = 2;
 void Player::ADDWEAPON()
 {
@@ -336 +337 @@
   turret1->setStateDuration(WS_SHOOTING, (float)rand()/RAND_MAX*.5+.1);
 
-  this->weaponMan->addWeapon(turret1, 2, slot++);
+  this->weaponMan->addWeapon(turret1, 2);
 
   this->weaponMan->changeWeaponConfig(2);

trunk/src/world_entities/weapons/turret.cc

@@ -97 +97 @@
   this->setEmissionPoint(1.684, 0.472, 0);
   //this->getProjectileFactory()->prepare(100);
-
-
 }
 
@@ -140 +138 @@
   if (target != NULL)
   {
-    pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0   /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
+    pj->setVelocity(this->getVelocity()+(this->getAbsDir().apply(Vector(1,0,0))*100.0 + VECTOR_RAND(20)
+            /*target->getAbsCoor() - this->getAbsCoor()*/)*.5);//this->getVelocity());
   }
   else
@@ -148 +147 @@
   pj->setAbsCoor(this->getEmissionPoint());
   pj->setAbsDir(this->getAbsDir());
+
   State::getWorldEntityList()->add(pj);
 }
-
 
 void Turret::destroy ()

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -220 +220 @@
   if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))
   {
-    PRINTF(2)("Slot %d of config %d is not availiabe\n", slotID, configID);
+    PRINTF(2)("Slot %d of config %d is not availiabe (max: %d)\n", slotID, configID, this->slotCount);
     return;
   }
@@ -238 +238 @@
 
   //! @todo check if the weapon is already assigned to another config in another slot
-
   this->configs[configID][slotID] = weapon;
   if (this->parent != NULL)
@@ -403 +402 @@
  * @param the selected weaponconfig
  */
-int WeaponManager::getNextFreeSlot(int configID)
+int WeaponManager::getNextFreeSlot(int configID, long capability)
 {
   for( int i = 0; i < this->slotCount; ++i)
   {
-    if( this->configs[configID][i] == NULL)
+    if( this->configs[configID][i] == NULL &&
+        (this->currentSlotConfig[i].capability & capability == this->currentSlotConfig[i].capability))
       return i;
   }

trunk/src/world_entities/weapons/weapon_manager.h

@@ -87 +87 @@
 
   private:
-    int getNextFreeSlot(int configID);
+    int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
 
   private: