Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/world_entities/weapon.h

Timestamp:

Apr 7, 2005, 3:54:49 PM (19 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

File:

• orxonox/branches/levelloader/src/world_entities/weapon.h (modified) (3 diffs)

orxonox/branches/levelloader/src/world_entities/weapon.h

@@ -43 +43 @@
 
  public:
-  Weapon ();
+  Weapon (PNode* parent, Vector* coordinate, Quaternion* direction);
   virtual ~Weapon ();
   
@@ -57 +57 @@
   bool isActive(void);
 
-  virtual void setWeaponIdleTime(float time);
-  virtual float getWeaponIdleTime(void);
-  virtual bool hasWeaponIdleTimeElapsed(void);
+  void setWeaponIdleTime(float time);
+  float getWeaponIdleTime(void);
+  bool hasWeaponIdleTimeElapsed(void);
 
-  virtual void fire(void);
+  virtual void fire(void) = 0;
   virtual void hit (WorldEntity* weapon, Vector* loc);
   virtual void destroy(void);
@@ -69 +69 @@
   virtual void draw(void);
 
+ protected:
+  tList<WorldEntity>* worldEntities;
+  float localTime;
+  float idleTime;
+  float slowDownFactor;
 
  private:
   bool enabled;
-  float localTime;
-  float slowDownFactor;
   Projectile* projectile;
   //WeaponSound sound;
-
 };