Changeset 3583 in orxonox.OLD for orxonox/trunk/src/world_entities/weapon.h

Timestamp:

Mar 16, 2005, 11:08:33 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: some changes in the character_attributes, projectile and weapon.

File:

• orxonox/trunk/src/world_entities/weapon.h (modified) (2 diffs)

orxonox/trunk/src/world_entities/weapon.h

@@ -28 +28 @@
 class Projectile;
 
+typedef enum {
+  SHOOT,
+  EMPTY,
+  RELOAD,
+  SPECIAL1,
+  SPECIAL2,
+  SPECIAL3
+} weaponSoundType;
+
+
 class Weapon : public WorldEntity 
 {
@@ -36 +46 @@
   virtual ~Weapon ();
   
-  void enable();
-  void disable();
-  bool isEnabled();
+  void enable(void);
+  void disable(void);
+  bool isEnabled(void);
 
   void setProjectile(Projectile* projectile);
-  Projectile* getProjectile();
+  Projectile* getProjectile(void);
 
-  virtual void activate();
-  virtual void deactivate();
-  bool isActive();
+  virtual void activate(void);
+  virtual void deactivate(void);
+  bool isActive(void);
 
-  void setWeaponEnergy(int energy);
-  int addWeaponEnergy(int addEnergy);
-  void substractWeaponEnergy(int subEnergy);
-  int getWeaponEnergy();
+  virtual void setWeaponIdleTime(float time);
+  virtual float getWeaponIdleTime(void);
+  virtual bool hasWeaponIdleTimeElapsed(void);
 
-  virtual void fire();
+  virtual void fire(void);
   virtual void hit (WorldEntity* weapon, Vector* loc);
-  virtual void destroy ();
+  virtual void destroy(void);
   
-  virtual void tick (float time);
-  virtual void draw ();
+  virtual void tick(float time);
+  virtual void weaponIdle(void);
+  virtual void draw(void);
 
 
  private:
   bool enabled;
-  float firingRate;
   float localTime;
   float slowDownFactor;
-  int energyConsumption;
-  int energyLimit;
   Projectile* projectile;
+  //WeaponSound sound;
 
 };