Changeset 10545 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2007, 5:39:05 AM (18 years ago)

Author:

marcscha

Message:

pirate explosion fix

Location:

trunk/src/world_entities

Files:

• npcs/npc.cc (modified) (5 diffs)
• npcs/npc.h (modified) (1 diff)
• projectiles/hbolt.cc (modified) (2 diffs)
• projectiles/lbolt.cc (modified) (2 diffs)
• projectiles/mbolt.cc (modified) (2 diffs)
• projectiles/swarm_projectile.cc (modified) (1 diff)
• weapons/swarm_launcher.cc (modified) (1 diff)

trunk/src/world_entities/npcs/npc.cc

@@ -73 +73 @@
                         ->addMethod("setAI", Executor1<NPC, lua_State*, bool>(&NPC::setAI))
                         ->addMethod("setVisibility", Executor1<WorldEntity, lua_State*, bool>(&WorldEntity::setVisibility))
-                        ->addMethod("destroy", Executor0<NPC, lua_State*/*, WorldEntity**/>(&NPC::destroy))
+                        ->addMethod("destroy", Executor0<NPC, lua_State*/*, WorldEntity**/>(&NPC::destroyThis))
                        );
 
@@ -81 +81 @@
   this->registerObject(this, NPC::_objectList);
 
-  this->toList(OM_GROUP_01);
+  this->toList(OM_GROUP_00);
   this->bAIEnabled = false;
 
@@ -262 +262 @@
 }
 
-void NPC::destroy( /*WorldEntity* killer*/ )
+void NPC::destroy( WorldEntity* killer )
 {
 
@@ -314 +314 @@
   //}
 
+  this->toList(OM_NULL);
+  this->setAI( false);
+  this->setAbsCoor(-10000,-10000,-10000);
+  
+
 }
 
@@ -430 +435 @@
 void NPC::hit( float damage, WorldEntity* killer)
 {
+  this->destroy( killer);
   this->setDamage(killer->getDamage());
 }

trunk/src/world_entities/npcs/npc.h

@@ -35 +35 @@
   void setAI(bool activate);
   inline void enableAI(int flag) { this->bAIEnabled = (bool)flag; }
-  void destroy( /*WorldEntity* killer*/ );
+  void destroy( WorldEntity* killer );
 
   void hit( float damage, WorldEntity* killer);
+
+  inline void destroyThis() { this->destroy(NULL);};
 
 private:

trunk/src/world_entities/projectiles/hbolt.cc

@@ -20 +20 @@
 #include "state.h"
 #include "model.h"
+#include "world_entities/npcs/npc.h"
 
 #include "particles/dot_emitter.h"
@@ -147 +148 @@
   this->angle += this->rotationSpeed * dt;
 
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
   {
-    if( ((*eIterator)->getOMListNumber() != (this->origList -1))   && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
+    if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
     {
-      (*eIterator)->hit (this->getDamage(),this);
+      (*eIterator)->destroy(this); //hit (this->getDamage(),this);
       this->deactivate();
   PRINTF(0)("HBolt destroyed\n");

trunk/src/world_entities/projectiles/lbolt.cc

@@ -22 +22 @@
 #include "state.h"
 #include "model.h"
+
+#include "world_entities/npcs/npc.h"
 
 #include "particles/dot_emitter.h"
@@ -148 +150 @@
   angle += rotationSpeed * dt;
 
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
   {
-    if( ((*eIterator)->getOMListNumber() != (this->origList -1))   && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
+    if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
     {
-      (*eIterator)->hit (this->getDamage(),this);
+      (*eIterator)->destroy(this); //hit (this->getDamage(),this);
       this->deactivate();
   PRINTF(0)("LBolt destroyed\n");

trunk/src/world_entities/projectiles/mbolt.cc

@@ -22 +22 @@
 #include "state.h"
 #include "model.h"
+
+#include "world_entities/npcs/npc.h"
 
 #include "particles/dot_emitter.h"
@@ -176 +178 @@
   this->trail->tick(dt);
 
-  for( ObjectList<Playable>::const_iterator eIterator = Playable::objectList().begin(); eIterator !=Playable::objectList().end(); eIterator++)
+  for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
   {
     if( ((*eIterator)->getOMListNumber() != (this->origList -1))  && ((*eIterator)->getAbsCoor() - this->getAbsCoor()).len() <= 8)
     {
-      (*eIterator)->hit (this->getDamage(),this);
+      (*eIterator)->destroy(this); //hit (this->getDamage(),this);
       this->deactivate();
       PRINTF(0)("MBolt destroyed\n");

trunk/src/world_entities/projectiles/swarm_projectile.cc

@@ -224 +224 @@
   this->curDir = this->velocity;
 
-  if( this->target != NULL && (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // FIXME  Temp fake workaround for collision :)
+  if( this->target != NULL && (this->getAbsCoor() - this->target->getAbsCoor()).len() < 3)   // HACK  Temp fake workaround for collision :)
   {
     dynamic_cast<WorldEntity*>(target)->destroy(this); //hit(this->getDamage(), this);

trunk/src/world_entities/weapons/swarm_launcher.cc

@@ -156 +156 @@
   bool fired  = false;
 
-  PRINTF(0)("fire\n");
   Projectile* pj = NULL;
   for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)