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

Timestamp:

Dec 15, 2005, 2:14:53 AM (18 years ago)

Author:

bensch

Message:

orxonox/branches/objectmanager: all the WorldEntities regigister/unregister ath the ObjectManager as they should

File:

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

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

@@ -35 +35 @@
  * @param number of weapon slots of the model/ship <= 8 (limitied)
  */
-WeaponManager::WeaponManager(PNode* parent)
+WeaponManager::WeaponManager(WorldEntity* parent)
 {
   this->init();
@@ -155 +155 @@
  * a PNode.
  */
-void WeaponManager::setParent(PNode* parent)
-{
-  if (parent == NULL)
-    parent = PNode::getNullParent();
+void WeaponManager::setParent(WorldEntity* parent)
+{
   this->parent = parent;
   if (this->parent != NULL)
@@ -246 +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)
-    weapon->setParent(parent);
+    this->parent->addChild(weapon);
   PRINTF(3)("Added a new Weapon to the WeaponManager: config %i/ slot %i\n", configID, slotID);
 }