Changeset 10689 in orxonox.OLD for branches/adm/src/world_entities/weapons

Timestamp:

Jun 13, 2007, 5:51:40 PM (18 years ago)

Author:

retolu

Message:

first shooting of the turret

Location:

branches/adm/src/world_entities/weapons

Files:

• aiming_system.cc (modified) (2 diffs)
• bsp_weapon.cc (added)
• bsp_weapon.h (added)

branches/adm/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)
 {
-
-
 }