Changeset 10718 in orxonox.OLD for branches/presentation/src/world_entities/weapons

Timestamp:

Jun 18, 2007, 5:06:59 PM (18 years ago)

Author:

rennerc

Message:

dead gui

Location:

branches/presentation/src/world_entities/weapons

Files:

• aiming_system.cc (modified) (1 diff)
• bsp_weapon.cc (modified) (4 diffs)
• fps_sniper_rifle.cc (modified) (2 diffs)

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

@@ -100 +100 @@
   }
 
-  PRINTF(0)("entity: %s\n", nearestEntity->getClassCName());
-    return nearestEntity;
+  return nearestEntity;
 }
 

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

@@ -170 +170 @@
   if ( shortestDist < (pos - target->getAbsCoor()).len() )
   {
+
+#ifdef DEBUG_AIMING
     printf("HIT WALL\n");
-#ifdef DEBUG_AIMING
     this->debugDist = shortestDist;
 #endif
@@ -190 +191 @@
     if (r < p )
     {
+#ifdef DEBUG_AIMING
       printf( "HIT %s\n", target->getClassName().c_str() );
+#endif
       target->hit( this->damage, this );
     }
+#ifdef DEBUG_AIMING
     else
       printf( "MISHIT %s\n", target->getClassName().c_str() );
+#endif
 
   }
   else
   {
+#ifdef DEBUG_AIMING
     printf( "HIT %s\n", target->getClassName().c_str() );
+#endif
     target->hit( this->damage, this );
   }
@@ -217 +224 @@
     (*it)->draw();
   }
-#if 1
+#ifdef DEBUG_AIMING
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -231 +238 @@
   Vector mp = this->getAbsCoor();
   Vector op = this->getAbsDir().apply( Vector(1, 0, 0) );
-#ifdef DEBUG_AIMING
+
   op *= debugDist;
-#else
-  op *= 1000;
-#endif
   op += mp;
 

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

@@ -154 +154 @@
 void FPSSniperRifle::fire()
 {
-  PRINTF(0)("sniper fire\n");
   this->bFire = true;
 }
@@ -193 +192 @@
   this->weapon->fire( bFire );
   
-  if ( bFire ){
-      PRINTF(0)("REAL FIRE\n");
-  }
   bFire = false;
 }