Changeset 10526 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jan 30, 2007, 11:37:43 PM (18 years ago)

Author:

patrick

Message:

probably the parenting fix

File:

• trunk/src/world_entities/weapons/weapon_manager.cc (modified) (1 diff)

trunk/src/world_entities/weapons/weapon_manager.cc

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