Changeset 10443 in orxonox.OLD for trunk/src/world_entities/weapons/weapon.cc

Timestamp:

Jan 28, 2007, 3:06:13 PM (17 years ago)

Author:

patrick

Message:

weapon now added to the main model

File:

• trunk/src/world_entities/weapons/weapon.cc (modified) (4 diffs)

trunk/src/world_entities/weapons/weapon.cc

@@ -124 +124 @@
   this->segs = 1;
 
+  this->preferedSide = -1;
+  this->preferedSlot = -1;
+
   this->shootAnim = new Animation3D**[this->getBarrels()];
   for (int i = 0; i < this->getBarrels(); i++)
@@ -159 +162 @@
  * needed, if there are more than one barrel or segments
  */
-void Weapon::init2() 
+void Weapon::init2()
 {
   if (this->barrels == 1 && this->segs == 1)
@@ -206 +209 @@
   LoadParam(root, "projectile", this, Weapon, setProjectileTypeC)
   .describe("Sets the name of the Projectile to load onto the Entity");
+
+  LoadParam(root, "energy", this, Weapon, setEnergyMax)
+  .describe("number of shoots/ energy whatever");
+
+  LoadParam(root, "slot", this, Weapon, setPreferedSlot)
+  .describe("slot this weapon will be added");
 /*
   LoadParam(root, "emission-point", this, Weapon, setEmissionPoint)
@@ -463 +472 @@
     return energyToAdd - maxAddEnergy;
   }
-  
+
 }