Changeset 9162 in orxonox.OLD for branches/presentation/src/world_entities/npcs

Timestamp:

Jul 4, 2006, 6:15:10 PM (19 years ago)

Author:

rennerc

Message:

 

Location:

branches/presentation/src/world_entities/npcs

Files:

• generic_npc.cc (modified) (1 diff)
• generic_npc.h (modified) (1 diff)
• ground_turret.cc (modified) (1 diff)
• ground_turret.h (modified) (1 diff)

branches/presentation/src/world_entities/npcs/generic_npc.cc

@@ -581 +581 @@
 
 
-void GenericNPC::destroy()
+void GenericNPC::destroy(WorldEntity* killer)
 {
   int randi = (int)(5.0f * (float)rand()/(float)RAND_MAX);

branches/presentation/src/world_entities/npcs/generic_npc.h

@@ -77 +77 @@
 
 
-  void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   private:

branches/presentation/src/world_entities/npcs/ground_turret.cc

@@ -176 +176 @@
 }
 
-void GroundTurret::destroy()
+void GroundTurret::destroy(WorldEntity* killer)
 {
   this->setAbsDirSoft(Quaternion(-90, Vector(0,0,1)), 90);

branches/presentation/src/world_entities/npcs/ground_turret.h

@@ -25 +25 @@
   virtual void leftWorld ();
 
-  virtual void destroy();
+  virtual void destroy(WorldEntity* killer);
 
   virtual void draw() const;