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

Timestamp:

Jun 17, 2007, 2:25:20 PM (18 years ago)

Author:

rennerc

Message:

player cannot shoot throu walls
per default worldentities cannot be killed
weapon correct again

Location:

branches/presentation/src/world_entities/npcs

Files:

• npc.cc (modified) (1 diff)
• npc.h (modified) (1 diff)

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

@@ -440 +440 @@
 
 // HACK just to make sure they explode as nice as possible :)
-void NPC::hit( float damage, WorldEntity* killer)
+/*void NPC::hit( float damage, WorldEntity* killer)
 {
   this->destroy( killer);
   this->setDamage(killer->getDamage());
-}
+}*/

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

@@ -37 +37 @@
   void destroy( WorldEntity* killer );
 
-  void hit( float damage, WorldEntity* killer);
+  //void hit( float damage, WorldEntity* killer);
 
   inline void destroyThis() { this->destroy(NULL);};