Changeset 10676 in orxonox.OLD for branches/vs-enhencements/src/world_entities/weapons/weapon_slot.h

Timestamp:

Jun 7, 2007, 5:10:52 PM (17 years ago)

Author:

nicolasc

Message:

xfer

File:

• branches/vs-enhencements/src/world_entities/weapons/weapon_slot.h (modified) (4 diffs)

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

@@ -9 +9 @@
 #include "p_node.h"
 #include "weapon.h"
+#include "weapon_manager.h"
 
 class Weapon;
@@ -31 +32 @@
 
   inline Weapon* getCurrentWeapon() { return this->currentWeapon; }
-  inline void setCurrentWeapon(Weapon* weapon) { this->currentWeapon = weapon; }
+  inline void setCurrentWeapon(int config) { this->currentWeapon = this->configs[config]; }
 
   inline Weapon* getNextWeapon() { return this->nextWeapon; }
-  inline void setNextWeapon(Weapon* weapon) { this->nextWeapon = weapon; }
+  inline void setNextWeapon(int config) { if (config == -1) this->nextWeapon = NULL; else this->nextWeapon = configs[config]; }
 
-  inline void setNextWeapon(const std::string& weaponName){this->nextWeapon = Weapon::createWeapon(weaponName); };
-  inline void setCurrentWeapon(const std::string& weaponName){ this->currentWeapon = Weapon::createWeapon(weaponName); };
+  inline void setNextToCurrent() {this->currentWeapon = this->nextWeapon; };
+//   inline void setNextWeapon(const std::string& weaponName){this->nextWeapon = Weapon::createWeapon(weaponName); };
+//   inline void setCurrentWeapon(const std::string& weaponName){ this->currentWeapon = Weapon::createWeapon(weaponName); };
 
+  inline void addWeapon(const std::string& weaponName, int config) {this->configs[config] = Weapon::createWeapon(weaponName); }
+  inline void setWeapon(Weapon* weapon, int config) {this->configs[config] = weapon; };
+  inline Weapon* getWeapon(int config) { if (config > WM_MAX_CONFIGS) return NULL; return this->configs[config]; };
 
   inline void setWeaponConfig(int slot, int side) { this->weaponSlot = slot; this->weaponSide = side; }
@@ -44 +49 @@
   inline int getWeaponSide() { return this->weaponSide; }
 
+  void removeWeapon(Weapon* weapon);
 
 private:
@@ -52 +58 @@
   long          capability;             //!< the capabilities of the Slot @see WeaponSlotCapability.
 
+  Weapon*       configs[WM_MAX_CONFIGS];
+
   Weapon*       currentWeapon;          //!< The current weapon this slot is carrying.
   Weapon*       nextWeapon;             //!< either NULL or the next weapon that will be set (require currentWeapon to deactivate)
+
+//   int           currentConfig;
+//   int           nextConfig;
 };