Changeset 5968 in orxonox.OLD for branches/network/src/world_entities/weapons/bomb.h

Timestamp:

Dec 7, 2005, 4:16:51 PM (18 years ago)

Author:

patrick

Message:

network: merged the trunk into the network with the command svn merge -r5824:HEAD ../trunk network, changes changed… bla bla..

File:

• branches/network/src/world_entities/weapons/bomb.h (modified) (3 diffs)

branches/network/src/world_entities/weapons/bomb.h

@@ -8 +8 @@
 
 #include "projectile.h"
+
 class FastFactory;
 class ParticleSystem;
 class ParticleEmitter;
+class Material;
 
 //! A Class to ...
@@ -31 +33 @@
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
   virtual void activate();
-  virtual void detonate();
   virtual void deactivate();
+
+  void detonate(float size);
 
  private:
@@ -40 +43 @@
 
   ParticleEmitter*                  emitter;
-
+  Model*                            detonationSphere;
+  Material*                         detonationMaterial;
 };