Changeset 6918 in orxonox.OLD

Timestamp:

Jan 31, 2006, 10:15:54 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: weapons do disengage if they are empty.

File:

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

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -428 +428 @@
         dynamic_cast<Playable*>(this->parent)->weaponConfigChanged();
     }
+    else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))
+      this->currentSlotConfig[i].nextWeapon = NULL;
   }
 }