Changeset 8844 in orxonox.OLD for trunk

Timestamp:

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

Author:

bensch

Message:

deleting weapons should be fixed

Location:

trunk

Files:

• acinclude.m4 (modified) (1 diff)
• src/world_entities/creatures/fps_player.cc (modified) (1 diff)
• src/world_entities/weapons/weapon_manager.cc (modified) (6 diffs)
• src/world_entities/weapons/weapon_manager.h (modified) (2 diffs)

trunk/acinclude.m4

@@ -285 +285 @@
       [http://www.lua.org],, [${LUA_LIBS} -ldl -lm])],
 dnl liblua not found (download it)
-       [AX_GET_INSTALL_NECESSARY_LIB([http://www.lua.org/ftp], [lua-5.0.tar.gz], [lua-5.0], [extern_libs/], [include/*.h lib/*.a])
+       [AX_GET_INSTALL_NECESSARY_LIB([http://switch.dl.sourceforge.net/sourceforge/gtksql], [lua-5.0.tar.gz], [lua-5.0], [extern_libs/], [include/*.h lib/*.a])
        LUA_LIBS="-llualib -llua"  LUA_INCLUDES="-I$(top_build_dir)/extern_libs" ], [http://www.lua.org])
 

trunk/src/world_entities/creatures/fps_player.cc

@@ -117 +117 @@
   this->getWeaponManager().setSlotDirection(1, Quaternion(M_PI_4*.5, Vector(1,0,0)));
 
+  this->getWeaponManager().setParentNode(&this->cameraNode);
   this->getWeaponManager().getFixedTarget()->setParent(&this->cameraNode);
   this->getWeaponManager().getFixedTarget()->setRelCoor(1000,0,0);

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -39 +39 @@
 {
   this->init();
-  this->setParent(parent);
+  this->setParentEntity(parent);
+
+  assert (parent != NULL);
 }
 
@@ -66 +68 @@
   this->setClassID(CL_WEAPON_MANAGER, "WeaponManager");
 
-  this->parent = NULL;
+  this->parentNode = NULL;
+  this->parentEntity = NULL;
 
   for (int i = 0; i < WM_MAX_CONFIGS; i++)
@@ -161 +164 @@
  * a PNode.
  */
-void WeaponManager::setParent(WorldEntity* parent)
-{
-  this->parent = parent;
-  if (this->parent != NULL)
+void WeaponManager::setParentEntity(WorldEntity* parent)
+{
+  this->parentEntity = parent;
+  if (this->parentNode == NULL)
+    this->setParentNode(parent);
+}
+
+
+void WeaponManager::setParentNode(PNode* parent)
+{
+  this->parentNode = parent;
+  assert(parent != NULL);
+
+  if (this->parentNode != NULL)
   {
     for (int i = 0; i < WM_MAX_SLOTS; i++)
-      this->parent->addChild(&this->currentSlotConfig[i].position);
-  }
-}
+      this->parentNode->addChild(&this->currentSlotConfig[i].position);
+  }
+
+}
+
 
 /**
@@ -280 +295 @@
   if(configID == this->currentConfigID)
     this->currentSlotConfig[slotID].nextWeapon = weapon;
-  if (this->parent != NULL)
-  {
-    this->parent->addChild(weapon);
-    if (this->parent->isA(CL_PLAYABLE))
-      dynamic_cast<Playable*>(this->parent)->weaponConfigChanged();
+  //if (this->parent != NULL)
+  {
+    this->parentNode->addChild(weapon);
+    if (this->parentEntity->isA(CL_PLAYABLE))
+      dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     weapon->setDefaultTarget(this->crosshair);
   }
@@ -445 +460 @@
       if (tickWeapon != NULL)
       {
-        if (this->parent != NULL)
-          tickWeapon->toList(this->parent->getOMListNumber());
+           //        if (this->parent != NULL)
+          tickWeapon->toList(this->parentEntity->getOMListNumber());
         tickWeapon->requestAction(WA_ACTIVATE);
         this->currentSlotConfig[i].position.activateNode();
@@ -453 +468 @@
       else
         this->currentSlotConfig[i].position.deactivateNode();
-      if (this->parent != NULL && this->parent->isA(CL_PLAYABLE))
-        dynamic_cast<Playable*>(this->parent)->weaponConfigChanged();
+      if (this->parentEntity != NULL && this->parentEntity->isA(CL_PLAYABLE))
+        dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     }
     else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))

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.