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

Timestamp:

Jun 11, 2007, 11:30:56 AM (17 years ago)

Author:

nicolasc

Message:

some hack, but still does not work

Location:

branches/vs-enhencements/src/world_entities/weapons

Files:

• weapon.cc (modified) (1 diff)
• weapon_slot.h (modified) (1 diff)

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

@@ -145 +145 @@
 
   this->hideInactive = true;                       //< The Weapon will be hidden if it is inactive (by default)
+  this->currentState = WS_INACTIVE;
 
   this->minCharge = 1.0;                           //< The minimum charge the Weapon can hold is 1 unit.

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

@@ -43 +43 @@
   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 Weapon* getWeapon(int config) { if (config > WM_MAX_CONFIGS || config < 0) return NULL; return this->configs[config]; };
 
   inline void setWeaponConfig(int slot, int side) { this->weaponSlot = slot; this->weaponSide = side; }