Changeset 10694 in orxonox.OLD for branches/adm/src/world_entities/weapons/bsp_weapon.h

Timestamp:

Jun 14, 2007, 3:50:14 PM (18 years ago)

Author:

retolu

Message:

adm working

File:

• branches/adm/src/world_entities/weapons/bsp_weapon.h (modified) (2 diffs)

branches/adm/src/world_entities/weapons/bsp_weapon.h

@@ -10 +10 @@
 #include "aiming_system.h"
 #include "effects/explosion.h"
+
+#include <list>
+
+#include "particles/box_emitter.h"
+#include "particles/sprite_particles.h"
+
+class MuzzleFlash : public WorldEntity
+{
+  ObjectListDeclaration(MuzzleFlash);
+  public:
+    void explode (float lifetime);
+
+    MuzzleFlash ();
+    virtual ~MuzzleFlash ();
+
+    virtual void activate();
+    virtual void deactivate();
+
+    virtual void tick (float time);
+    virtual void draw() const;
+
+    void setLifeTime( float lifeTime ){ this->lifeTime = lifeTime; }
+    
+    void drawParticles(){ if (explosionParticles) explosionParticles->draw(); }
+
+  protected:
+    //static FastFactory*        fastFactory;
+
+    float                      lifeTime;
+    float                      lifeCycle;
+
+    SpriteParticles*    explosionParticles;
+    BoxEmitter*                emitter;
+
+};
+
 
 class BspWeapon : public WorldEntity
@@ -38 +74 @@
                 void setAlwaysHits( bool r ){ this->alwaysHits = r; }
                 void addPoint(float x, float y, float z);
-                PNode* gunFire1;
-                PNode* gunFire2;
+                
+    std::list<MuzzleFlash*> gunFire;
 
                 float bRate;
                 bool bFire;
-                int element;
-
-                Explosion gunFire;
 
                 AimingSystem* aimingSystem;