Changeset 9191 in orxonox.OLD for branches

Timestamp:

Jul 5, 2006, 7:48:16 AM (18 years ago)

Author:

patrick

Message:

better cleanup and stuff

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (1 diff)
• weapons/aiming_system.cc (modified) (3 diffs)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -59 +59 @@
 {
   this->setPlayer(NULL);
+
+  if( this->aimingSystem)
+    delete this->aimingSystem;
 }
 

branches/presentation/src/world_entities/weapons/aiming_system.cc

@@ -82 +82 @@
 WorldEntity* AimingSystem::getNearestTarget()
 {
-
-//   PRINTF(0)("size: %i\n", this->selectionList.size());
-
-
   if( this->selectionList.size() == 0)
     return NULL;
@@ -105 +101 @@
   }
 
-  if( nearestEntity != this->owner)
+
     return nearestEntity;
-  else
-    return NULL;
 }
 
@@ -119 +113 @@
 void AimingSystem::hit(float damage, WorldEntity* killer)
 {
-  this->selectionList.push_back(killer);
+  if( this->owner != killer)
+    this->selectionList.push_back(killer);
 }