Changeset 10698 in orxonox.OLD for trunk/src/world_entities/weapons/aiming_system.cc

Timestamp:

Jun 14, 2007, 5:33:43 PM (17 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

File:

• trunk/src/world_entities/weapons/aiming_system.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/aiming_system.cc

@@ -112 +112 @@
 void AimingSystem::hit(float damage, WorldEntity* killer)
 {
-  if( this->owner != killer)
+  if( this->owner != killer && killer != this && !killer->isA( AimingSystem::staticClassID() ) )
   {
     //PRINTF(0)("real hit: %s\n", killer->getClassCName());
@@ -127 +127 @@
 void AimingSystem::tick(float dt)
 {
-
-
 }