Context Navigation

Changeset 8777 in orxonox.OLD for trunk

Timestamp:

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

Author:

patrick

Message:

trunk: damage and distruction reimplemented

Location:

trunk/src

Files:

r8724	r8777
56	56	float damage = 0.0f;
57	57
58		PRINTF(4)("Dealing damage - Handling collision: %s vs %s\n",
	58	PRINTF(5)("Dealing damage - Handling collision: %s vs %s\n",
59	59	collision->getEntityA()->getClassName(),
60	60	collision->getEntityB()->getClassName());

r8724	r8777
180	180	this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);
181	181	Explosion::explode(this, Vector(10,10,10));
	182
	183	this->toList(OM_DEAD);
182	184	}

-                      r7193
+                      r8777
+}
-/**
- *  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 ()
-{}
 /**

-                      r7193
+                      r8777
+}
+/**
+ *  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 ()
+{}

-                      r7193
+                      r8777
+}
-void TargetingTurret::destroy ()
-{}
 /**
  * draws the TargetingTurret

-                      r6637
+                      r8777
     virtual void tick(float dt);
     virtual void fire();
-    virtual void destroy();
     virtual void draw() const;
 …
     float          lockedTime;
     float          neededLockTime;
   };
+  };
 #endif /* _TARGETING_TURRET_H */

-                      r7193
+                      r8777
+}
+/**
+ *  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 ()
+{}
 /**

-                      r8724
+                      r8777
 #include "collision_handle.h"
 #include "collision_event.h"
+#include "game_rules.h"
+#include "kill.h"
 #include <stdarg.h>
 …
   // 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);
 …
   this->decreaseHealth(damage);
+  PRINTF(0)("Hit me: %s now only %f/%f health\n", this->getClassName(), this->getHealth(), this->getHealthMax());
   if( this->getHealth() > 0)
+  {
 …
     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);
+}

r8724	r8777
95	95
96	96	virtual void hit(float damage);
97		virtual void destroy() {};
	97	virtual void destroy();
98	98
99	99

Note: See TracChangeset for help on using the changeset viewer.