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

Timestamp:

Jun 14, 2007, 12:50:56 PM (18 years ago)

Author:

nicolasc

Message:

xfer, WFM…

Location:

branches/vs-enhencements/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (1 diff)
• weapon_slot.cc (modified) (1 diff)

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

@@ -319 +319 @@
   this->slotConfigs[slotID]->setWeapon(weapon, configID);
   weapon->setAmmoContainer(this->getAmmoContainer(weapon->getProjectileType()));
-//   if(configID == this->currentConfigID)
-//     this->slotConfigs[slotID]->setNextWeapon(weapon);
+  if(configID == this->currentConfigID)
+    this->slotConfigs[slotID]->setNextWeapon(configID);
   //if (this->parent != NULL)
   {

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

@@ -68 +68 @@
 
   LoadParam(root, "addWeapon", this, WeaponSlot, addWeapon)
-  .describe("create a new Weapon, and add it to config");
+  .describe("create a new Weapon, and add it to config")
+  .defaultValues("", 0);
 }