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

Timestamp:

Jan 25, 2006, 9:29:45 PM (19 years ago)

Author:

patrick

Message:

trunk: merged network back to trunk

File:

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

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -217 +217 @@
 bool WeaponManager::addWeapon(Weapon* weapon, int configID, int slotID)
 {
-  assert(weapon != NULL);
+  //if ( weapon == NULL )
+    return false;
 
   if (unlikely(configID >= WM_MAX_CONFIGS || slotID >= (int)this->slotCount))