Changeset 6137 in orxonox.OLD for branches/objectmanager/src/world_entities/weapons/weapon_manager.cc

Timestamp:

Dec 16, 2005, 6:10:59 PM (18 years ago)

Author:

bensch

Message:

om: linkage-fixes in the WeaponManager

File:

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

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

@@ -244 +244 @@
   //! @todo check if the weapon is already assigned to another config in another slot
   this->configs[configID][slotID] = weapon;
-  weapon->toList(parent->getOMListNumber());
   if (this->parent != NULL)
+  {
     this->parent->addChild(weapon);
+  }
   PRINTF(3)("Added a new Weapon to the WeaponManager: config %i/ slot %i\n", configID, slotID);
 }
@@ -372 +373 @@
       else
       {
+        if (this->currentSlotConfig[i].currentWeapon != NULL)
+          this->currentSlotConfig[i].currentWeapon->toList(OM_NULL);
         tickWeapon = this->currentSlotConfig[i].currentWeapon = this->currentSlotConfig[i].nextWeapon;
         if (tickWeapon != NULL)
@@ -377 +380 @@
           tickWeapon->requestAction(WA_ACTIVATE);
           tickWeapon->setParent(&this->currentSlotConfig[i].position);
+          tickWeapon->toList(this->parent->getOMListNumber());
           this->currentSlotConfig[i].position.activateNode();
         }