Changeset 8844 in orxonox.OLD for trunk/src/world_entities/weapons/weapon_manager.h

Timestamp:

Jun 28, 2006, 12:17:53 PM (19 years ago)

Author:

bensch

Message:

deleting weapons should be fixed

File:

• trunk/src/world_entities/weapons/weapon_manager.h (modified) (2 diffs)

trunk/src/world_entities/weapons/weapon_manager.h

@@ -70 +70 @@
     long getSlotCapability(int slot) const { return this->currentSlotConfig[slot].capability; };
 
-    void setParent(WorldEntity* parent);
+    void setParentEntity(WorldEntity* parent);
+    WorldEntity* getParentEntity() const { return this->parentEntity; };
+
+    void setParentNode(PNode* node);
     /** @returns the Parent (carrier) of this WeaponManager */
-    PNode* getParent() const { return this->parent; };
+    PNode* getParentNode() const { return this->parentNode; };
 
     bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
@@ -107 +110 @@
 
   private:
-    WorldEntity*            parent;                                   //!< The parent, this WeaponManager is connected to.
+    WorldEntity*            parentEntity;                             //!< The parent, this WeaponManager is connected to.
+    PNode*                  parentNode;                               //!< The parented Node the WeaponManager is connected to. (by default == parentEntity).
 
     int                     slotCount;                                //!< number of weapon slots the ship has.