Changeset 9188 in orxonox.OLD for branches

Timestamp:

Jul 5, 2006, 7:32:59 AM (18 years ago)

Author:

patrick

Message:

aiming system now works

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

@@ -258 +258 @@
   if( this->bFire)
   {
-    this->getWeaponManager().fire();
+    //this->getWeaponManager().fire();
 
     WorldEntity* target = this->aimingSystem->getNearestTarget();

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

@@ -62 +62 @@
 
   // registering default reactions:
-//   this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
+  this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
@@ -120 +120 @@
 {
   this->selectionList.push_back(killer);
-
-  PRINTF(0)("hit hit hit, got: %s\n", killer->getClassName());
-  printf("aimingsystem: hit()\n");
 }
 
@@ -134 +131 @@
 {
 
-//   this->selectionList.clear();
+
 }