Changeset 8777 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jun 26, 2006, 12:59:13 AM (19 years ago)

Author:

patrick

Message:

trunk: damage and distruction reimplemented

Location:

trunk/src/world_entities/weapons

Files:

• aiming_turret.cc (modified) (1 diff)
• aiming_turret.h (modified) (1 diff)
• cannon.cc (modified) (1 diff)
• cannon.h (modified) (1 diff)
• hyperblaster.cc (modified) (1 diff)
• hyperblaster.h (modified) (1 diff)
• targeting_turret.cc (modified) (1 diff)
• targeting_turret.h (modified) (2 diffs)
• test_gun.cc (modified) (1 diff)
• test_gun.h (modified) (1 diff)
• turret.cc (modified) (1 diff)
• turret.h (modified) (1 diff)
• weapon.h (modified) (1 diff)

trunk/src/world_entities/weapons/aiming_turret.cc

@@ -152 +152 @@
 }
 
-void AimingTurret::destroy ()
-{}
 
 /**

trunk/src/world_entities/weapons/aiming_turret.h

@@ -27 +27 @@
     virtual void tick(float dt);
     virtual void fire();
-    virtual void destroy();
+
 
     virtual void draw() const;

trunk/src/world_entities/weapons/cannon.cc

@@ -167 +167 @@
 }
 
-/**
- *  is called, when the weapon is destroyed
- *
- * this is in conjunction with the hit function, so when a weapon is able to get
- * hit, it can also be destoryed.
-*/
-void Cannon::destroy ()
-{}
 
 /**

trunk/src/world_entities/weapons/cannon.h

@@ -24 +24 @@
 
     virtual void fire();
-    virtual void destroy();
 
     virtual void draw() const;

trunk/src/world_entities/weapons/hyperblaster.cc

@@ -155 +155 @@
 }
 
-/**
- *  is called, when the weapon is destroyed
- *
- * this is in conjunction with the hit function, so when a weapon is able to get
- * hit, it can also be destoryed.
-*/
-void Hyperblaster::destroy ()
-{}
+

trunk/src/world_entities/weapons/hyperblaster.h

@@ -23 +23 @@
 
     virtual void fire();
-    virtual void destroy();
 
   private:

trunk/src/world_entities/weapons/targeting_turret.cc

@@ -162 +162 @@
 }
 
-void TargetingTurret::destroy ()
-{}
-
 /**
  * draws the TargetingTurret

trunk/src/world_entities/weapons/targeting_turret.h

@@ -27 +27 @@
     virtual void tick(float dt);
     virtual void fire();
-    virtual void destroy();
 
     virtual void draw() const;
@@ -36 +35 @@
     float          lockedTime;
     float          neededLockTime;
-  }; 
+  };
 
 #endif /* _TARGETING_TURRET_H */

trunk/src/world_entities/weapons/test_gun.cc

@@ -190 +190 @@
 }
 
-/**
- *  is called, when the weapon is destroyed
- *
- * this is in conjunction with the hit function, so when a weapon is able to get
- * hit, it can also be destoryed.
-*/
-void TestGun::destroy ()
-{}
+
 
 /**

trunk/src/world_entities/weapons/test_gun.h

@@ -49 +49 @@
 
     virtual void fire();
-    virtual void destroy();
 
     virtual void draw() const;

trunk/src/world_entities/weapons/turret.cc

@@ -149 +149 @@
   pj->activate();
 }
-
-void Turret::destroy ()
-{}

trunk/src/world_entities/weapons/turret.h

@@ -24 +24 @@
     virtual void tick(float dt);
     virtual void fire();
-    virtual void destroy();
 
 

trunk/src/world_entities/weapons/weapon.h

@@ -173 +173 @@
     virtual void fire() {};
     virtual void reload() {};
-    virtual void destroy() {};