Changeset 9185 in orxonox.OLD

Timestamp:

Jul 5, 2006, 6:43:09 AM (18 years ago)

Author:

patrick

Message:

class ids and some debug stuff

Location:

branches/presentation/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/collision_reaction/cr_object_damage.cc (modified) (1 diff)
• world_entities/creatures/fps_player.cc (modified) (1 diff)
• world_entities/weapons/aiming_system.cc (modified) (2 diffs)

branches/presentation/src/defs/class_id.h

@@ -221 +221 @@
   CL_FPS_SNIPER_RIFLE           =    0x000003a7,
   CL_FPS_LASER_RIFLE            =    0x000003a8,
+  CL_AIMING_SYSTEM              =    0x000003a9,
 
   // Projectiles

branches/presentation/src/lib/collision_reaction/cr_object_damage.cc

@@ -56 +56 @@
   float damage = 0.0f;
 
-  PRINTF(5)("Dealing damage - Handling collision: %s vs %s\n",
+  PRINTF(4)("Dealing damage - Handling collision: %s vs %s\n",
             collision->getEntityA()->getClassName(),
             collision->getEntityB()->getClassName());

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

@@ -269 +269 @@
     }
   }
-
-  WorldEntity* target = this->aimingSystem->getNearestTarget();
-  if( target != NULL)
-  {
-    PRINTF(0)("hit hit hit, got: %s\n", target->getClassName());
-  }
-
 
 

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

@@ -54 +54 @@
 void AimingSystem::init()
 {
-  this->setClassID(CL_CROSSHAIR, "AimingSystem");
+  this->setClassID(CL_AIMING_SYSTEM, "AimingSystem");
   this->setName("AimingSystem");
 
@@ -118 +118 @@
 {
   this->selectionList.push_back(killer);
+
+  PRINTF(0)("hit hit hit, got: %s\n", killer->getClassName());
 }