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

Timestamp:

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

Author:

patrick

Message:

trunk: damage and distruction reimplemented

Location:

trunk/src/world_entities

Files:

• npcs/ground_turret.cc (modified) (1 diff)
• weapons/aiming_turret.cc (modified) (1 diff)
• weapons/aiming_turret.h (modified) (1 diff)
• weapons/cannon.cc (modified) (1 diff)
• weapons/cannon.h (modified) (1 diff)
• weapons/hyperblaster.cc (modified) (1 diff)
• weapons/hyperblaster.h (modified) (1 diff)
• weapons/targeting_turret.cc (modified) (1 diff)
• weapons/targeting_turret.h (modified) (2 diffs)
• weapons/test_gun.cc (modified) (1 diff)
• weapons/test_gun.h (modified) (1 diff)
• weapons/turret.cc (modified) (1 diff)
• weapons/turret.h (modified) (1 diff)
• weapons/weapon.h (modified) (1 diff)
• world_entity.cc (modified) (4 diffs)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/npcs/ground_turret.cc

@@ -180 +180 @@
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);
   Explosion::explode(this, Vector(10,10,10));
+
+  this->toList(OM_DEAD);
 }

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() {};
 
 

trunk/src/world_entities/world_entity.cc

@@ -38 +38 @@
 #include "collision_handle.h"
 #include "collision_event.h"
+#include "game_rules.h"
+#include "kill.h"
 
 #include <stdarg.h>
@@ -82 +84 @@
 
   // registering default reactions:
-//   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
+  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
   this->toList(OM_NULL);
@@ -736 +738 @@
   this->decreaseHealth(damage);
 
+  PRINTF(0)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
+
   if( this->getHealth() > 0)
   {
@@ -744 +748 @@
     this->destroy();
 
-//     if( State::getGameRules() != NULL)
-//       State::getGameRules()->registerKill(Kill(NULL, this));
-  }
+    if( State::getGameRules() != NULL)
+      State::getGameRules()->registerKill(Kill(NULL, this));
+  }
+}
+
+
+/**
+ * destoys the world entity
+ */
+void WorldEntity::destroy()
+{
+  PRINTF(0)("Destroy\n");
+  this->toList(OM_DEAD);
 }
 

trunk/src/world_entities/world_entity.h

@@ -95 +95 @@
 
   virtual void hit(float damage);
-  virtual void destroy() {};
+  virtual void destroy();