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

Timestamp:

Jun 3, 2007, 10:17:15 PM (18 years ago)

Author:

nicolasc

Message:

some modularisaztion hacking
hardlinked armor to WE Health

Location:

branches/vs-enhencements/src/world_entities/weapons

Files:

• weapon_manager.cc (modified) (4 diffs)
• weapon_manager.h (modified) (2 diffs)
• weapon_slot.cc (modified) (3 diffs)

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

@@ -1 @@
-
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -146 +145 @@
   BaseObject::loadParams(root);
 
-  LoadParam(root, "slot-count", this, WeaponManager, setSlotCount)
+  LoadParam(root, "slotCount", this, WeaponManager, setSlotCount)
   .describe("how many slots(cannons) the WeaponManager can handle");
+
 
   LOAD_PARAM_START_CYCLE(root, element);
@@ -156 +156 @@
   }
   LOAD_PARAM_END_CYCLE(element);
+
+
 }
 
@@ -357 +359 @@
  * @param slotCapability the capability @see WeaponSlotCapability
  */
-void WeaponManager::setSlotCapability(int slot, long slotCapability)
+void WeaponManager::setSlotCapability(int slot, unsigned long slotCapability)
 {
   if (slot > slotCount)

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

@@ -60 +60 @@
     // setting up the WeaponManager with the following functions
     void setSlotPosition(int slot, const Vector& position, PNode* parent = NULL);
+//     inline void setSlotPosition(float slot, float x, float y,float z) {setSlotPosition((int)slot, Vector(x,y,z));};
     void setSlotDirection(int slot, const Quaternion& rotation);
     /** @param slot the slot to get the relative position from @returns the relative position of the Carrier to the Slot */
     const Vector& getSlotPosition(int slot) const;
-    void setSlotCapability(int slot, long slotCapability);
+    void setSlotCapability(int slot, unsigned long slotCapability);
     /** @param slot the slot to get the capabilities from @returns the capabilies */
     long getSlotCapability(int slot) const;
@@ -76 +77 @@
     bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);
+
+    inline void createWeaponSlot(int slot, float x, float y, float z, long capability) {
+        this->setSlotPosition(slot, Vector( x, y, z));
+        this->setSlotCapability(slot, capability); };
+
+    inline void addWeaponToSlot(int config, int slot, const std::string& weaponName){
+      this->addWeapon( Weapon::createWeapon( weaponName ), config, slot); };
+
 
     Weapon* getWeapon(int slotID) const;

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

@@ -42 +42 @@
 
 WeaponSlot::~WeaponSlot()
-{}
+{
+}
 
 
@@ -55 +56 @@
 
   LoadParam(root, "slot", this, WeaponSlot, setWeaponConfig)
-      .describe("sets the weapon slot");
+  .describe("sets the weapon slot");
 }
 
@@ -63 +64 @@
 void WeaponSlot::setWeaponClass()
 {
-
 }