Changeset 10252 in orxonox.OLD for branches/playability/src/world_entities/weapons

Timestamp:

Jan 17, 2007, 1:41:51 PM (18 years ago)

Author:

nicolasc

Message:

bump

Location:

branches/playability/src/world_entities/weapons

Files:

• spike_thrower.cc (modified) (2 diffs)
• weapon.cc (modified) (1 diff)
• weapon_manager.cc (modified) (1 diff)

branches/playability/src/world_entities/weapons/spike_thrower.cc

@@ -20 +20 @@
 #include "world_entities/projectiles/projectile.h"
 #include "world_entities/projectiles/spike_ball.h"
+#include "world_entities/projectiles/spike.h"
 
 #include "model.h"
@@ -96 +97 @@
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_TURRET | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("SpikeBall");
+  this->setProjectileTypeC("Spike");
 
 //   this->loadModel("models/guns/turret1.obj", 1.0);

branches/playability/src/world_entities/weapons/weapon.cc

@@ -586 +586 @@
 bool Weapon::fireW()
 {
-  printf("fireW Weapon\n");
+//   printf("fireW Weapon\n");
   //if (likely(this->currentState != WS_INACTIVE))
   if (this->minCharge <= this->energy)

branches/playability/src/world_entities/weapons/weapon_manager.cc

@@ -431 +431 @@
 void WeaponManager::fire()
 {
-  printf("firing WM: ");
+//   printf("firing WM: ");
   Weapon* firingWeapon;
   for(int i = 0; i < this->slotCount; i++)
   {
-    printf("%i ", i);
+//     printf("%i ", i);
           firingWeapon = this->currentSlotConfig[i].currentWeapon;
       if( firingWeapon != NULL && firingWeapon->getCurrentState() == WS_SHOOTING) continue;
           if( firingWeapon != NULL) firingWeapon->requestAction(WA_SHOOT);
   }
-  printf("\n");
+//   printf("\n");
   /*
         this->crosshair->setRotationSpeed(500);