Changeset 10545 in orxonox.OLD for trunk/src/world_entities/npcs

Timestamp:

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

Author:

marcscha

Message:

pirate explosion fix

Location:

trunk/src/world_entities/npcs

Files:

• npc.cc (modified) (5 diffs)
• npc.h (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: