Changeset 10121 in orxonox.OLD for branches/playability/src/world_entities/weapons/weapon_manager.cc

Timestamp:

Dec 20, 2006, 1:09:05 PM (17 years ago)

Author:

marcscha

Message:

Deactivate Fix

File:

• branches/playability/src/world_entities/weapons/weapon_manager.cc (modified) (3 diffs)

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

@@ -420 +420 @@
   this->currentConfigID = weaponConfig;
   PRINTF(4)("Changing weapon configuration: to %i\n", this->currentConfigID);
+
   for (int i = 0; i < WM_MAX_SLOTS; i++)
     this->currentSlotConfig[i].nextWeapon = this->configs[currentConfigID][i];
@@ -472 +473 @@
   for(int i = 0; i < this->slotCount; i++)
   {
-/*
-    NICE LITTLE DEBUG FUNCTION
-       if (this->currentSlotConfig[i].currentWeapon != NULL || this->currentSlotConfig[i].nextWeapon != NULL)
+
+    //NICE LITTLE DEBUG FUNCTION
+    /*   if (this->currentSlotConfig[i].currentWeapon != NULL || this->currentSlotConfig[i].nextWeapon != NULL)
       printf("%p %p\n", this->currentSlotConfig[i].currentWeapon, this->currentSlotConfig[i].nextWeapon);*/
 
@@ -496 +497 @@
         }
       }
-
       // switching to next Weapon
       tickWeapon = this->currentSlotConfig[i].currentWeapon = this->currentSlotConfig[i].nextWeapon;
+      
       if (tickWeapon != NULL)
       {