Changeset 10544 in orxonox.OLD for trunk/src

Timestamp:

Jan 31, 2007, 5:25:42 AM (18 years ago)

Author:

nicolasc

Message:

bump

File:

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

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -523 +523 @@
         dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     }
-//     else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))
-//       this->currentSlotConfig[i]->setNextWeapon(NULL);
+    else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))
+      this->currentSlotConfig[i]->setCurrentWeapon(NULL);
   }
 }