Changeset 7078 for code/branches/presentation3

Timestamp:

Jun 2, 2010, 1:53:41 AM (14 years ago)

Author:

landauf

Message:

fixed a bug in WeaponSystem which lead to a crash in combination with the new FPS player

File:

• code/branches/presentation3/src/orxonox/weaponsystem/WeaponSystem.cc (modified) (1 diff)

code/branches/presentation3/src/orxonox/weaponsystem/WeaponSystem.cc

@@ -214 +214 @@
         Weapon* weapon = 0;
         while ((weapon = wPack->getWeapon(i++)))
-            weapon->getWeaponSlot()->removeWeapon();
+            if (weapon->getWeaponSlot())
+                weapon->getWeaponSlot()->removeWeapon();
 
         // Remove all added links from the WeaponSets