Changeset 10437 in orxonox.OLD for trunk/src

Timestamp:

Jan 28, 2007, 1:30:45 PM (18 years ago)

Author:

patrick

Message:

weapon slot is now moved outside

Location:

trunk/src/world_entities

Files:

• Makefile.am (modified) (2 diffs)
• WorldEntities.am (modified) (2 diffs)
• mount_point.cc (modified) (1 diff)
• weapons/weapon_manager.cc (modified) (23 diffs)
• weapons/weapon_manager.h (modified) (5 diffs)
• weapons/weapon_slot.cc (added)
• weapons/weapon_slot.h (added)

trunk/src/world_entities/Makefile.am

@@ -12 +12 @@
                      npcs/npc.cc\
                      weapons/weapon_manager.cc\
+                     weapons/weapon_slot.cc \
                      weapons/crosshair.cc \
                      weapons/weapon.cc\
@@ -36 +37 @@
                  npcs/npc.h\
                  weapons/weapon_manager.h\
+                 weapons/weapon_slot.cc \
                  weapons/crosshair.h \
                  weapons/weapon.h\

trunk/src/world_entities/WorldEntities.am

@@ -35 +35 @@
                 world_entities/questGUI/quest.cc \
                 \
+                world_entities/weapons/weapon_slot.cc \
                 world_entities/weapons/test_gun.cc \
                 world_entities/weapons/laser_cannon.cc \
@@ -166 +167 @@
                 questGUI/quest.h \
                 \
+                weapons/weapon_slot.h \
                 weapons/test_gun.h \
                 weapons/laser_cannon.cc \

trunk/src/world_entities/mount_point.cc

@@ -37 +37 @@
 {
   PRINTF(5)("Created mount point %s\n", name.c_str());
+  this->registerObject(this, MountPoint::_objectList);
 
   this->_name = name;

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -15 +15 @@
 
    2005-07-24: Benjamin Grauer: restructurate, so it can handle the new Weapons.
+   2007-01-28: Patrick Boenzli: loadable slots
 */
 
@@ -21 +22 @@
 #include "weapon_manager.h"
 #include "weapon.h"
+#include "weapon_slot.h"
 #include "crosshair.h"
 
@@ -77 +79 @@
   for (int i = 0; i < WM_MAX_SLOTS; i++)
   {
-    this->currentSlotConfig[i].capability = WTYPE_ALL;
-    this->currentSlotConfig[i].currentWeapon = NULL;
-    this->currentSlotConfig[i].nextWeapon = NULL;
+    this->currentSlotConfig[i] = new WeaponSlot();
+    this->currentSlotConfig[i]->setCapability(WTYPE_ALL);
+    this->currentSlotConfig[i]->setCurrentWeapon(NULL);
+    this->currentSlotConfig[i]->setNextWeapon(NULL);
 
     // NAMING
@@ -93 +96 @@
       sprintf(tmpName, "WeaponMan_slot%d", i);
     }
-    this->currentSlotConfig[i].position.setName(tmpName);
-    this->currentSlotConfig[i].position.deactivateNode();
+    this->currentSlotConfig[i]->setName(tmpName);
+    this->currentSlotConfig[i]->deactivateNode();
     delete[] tmpName;
   }
@@ -199 +202 @@
   {
     for (int i = 0; i < WM_MAX_SLOTS; i++)
-      this->parentNode->addChild(&this->currentSlotConfig[i].position);
+      this->parentNode->addChild(this->currentSlotConfig[i]);
   }
 
@@ -227 +230 @@
   if (slot < this->slotCount)
   {
-    this->currentSlotConfig[slot].position.setRelCoor(position);
+    this->currentSlotConfig[slot]->setRelCoor(position);
 
     if (parent != NULL)
-      this->currentSlotConfig[slot].position.setParent(parent);
+      this->currentSlotConfig[slot]->setParent(parent);
   }
 }
@@ -243 +246 @@
 {
   if (slot < this->slotCount)
-    this->currentSlotConfig[slot].position.setRelDir(rotation);
+    this->currentSlotConfig[slot]->setRelDir(rotation);
 }
 
@@ -298 +301 @@
   }
 
-  if (!(this->currentSlotConfig[slotID].capability & weapon->getCapability() & WTYPE_ALLKINDS) &&
-      this->currentSlotConfig[slotID].capability & weapon->getCapability() & WTYPE_ALLDIRS)
+  if (!(this->currentSlotConfig[slotID]->getCapability() & weapon->getCapability() & WTYPE_ALLKINDS) &&
+      this->currentSlotConfig[slotID]->getCapability() & weapon->getCapability() & WTYPE_ALLDIRS)
   {
     PRINTF(2)("Unable to add Weapon with wrong capatibility to Slot %d (W:%d M:%d)\n",
-              slotID, weapon->getCapability(), this->currentSlotConfig[slotID].capability);
+              slotID, weapon->getCapability(), this->currentSlotConfig[slotID]->getCapability());
     return false;
   }
@@ -313 +316 @@
   weapon->setAmmoContainer(this->getAmmoContainer(weapon->getProjectileType()));
   if(configID == this->currentConfigID)
-    this->currentSlotConfig[slotID].nextWeapon = weapon;
+    this->currentSlotConfig[slotID]->nextWeapon = weapon;
   //if (this->parent != NULL)
   {
@@ -319 +322 @@
     if (this->parentEntity->isA(Playable::staticClassID()))
       dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
-    
+
     weapon->setDefaultTarget(this->crosshair);
   }
@@ -352 +355 @@
  * sets the capabilities of a Slot
  * @param slot the slot to set the capability
- * @param slotCapability the capability @see WM_SlotCapability
+ * @param slotCapability the capability @see WeaponSlotCapability
  */
 void WeaponManager::setSlotCapability(int slot, long slotCapability)
@@ -358 +361 @@
   if (slot > slotCount)
     return;
-  this->currentSlotConfig[slot].capability = slotCapability;
+  this->currentSlotConfig[slot]->setCapability(slotCapability);
 }
 
@@ -381 +384 @@
           this->configs[i][j] = NULL;
       }
-      if (this->currentSlotConfig[j].currentWeapon == weapon)
+      if (this->currentSlotConfig[j]->getCurrentWeapon() == weapon)
       {
-        this->currentSlotConfig[j].nextWeapon = NULL;
+        this->currentSlotConfig[j]->setNextWeapon(NULL);
       }
     }
@@ -422 +425 @@
 
   for (int i = 0; i < WM_MAX_SLOTS; i++)
-    this->currentSlotConfig[i].nextWeapon = this->configs[currentConfigID][i];
+    this->currentSlotConfig[i]->nextWeapon = this->configs[currentConfigID][i];
 }
 
@@ -436 +439 @@
   {
 //     printf("%i ", i);
-          firingWeapon = this->currentSlotConfig[i].currentWeapon;
+          firingWeapon = this->currentSlotConfig[i]->getCurrentWeapon();
       if( firingWeapon != NULL && firingWeapon->getCurrentState() == WS_SHOOTING) continue;
           if( firingWeapon != NULL) firingWeapon->requestAction(WA_SHOOT);
@@ -455 +458 @@
   for(int i = 0; i < this->slotCount; i++)
   {
-    firingWeapon = this->currentSlotConfig[i].currentWeapon;
+    firingWeapon = this->currentSlotConfig[i]->currentWeapon;
     if( firingWeapon != NULL) firingWeapon->requestAction(WA_NONE);
   }
@@ -478 +481 @@
 
     //NICE LITTLE DEBUG FUNCTION
-    /*   if (this->currentSlotConfig[i].currentWeapon != NULL || this->currentSlotConfig[i].nextWeapon != NULL)
-      printf("%p %p\n", this->currentSlotConfig[i].currentWeapon, this->currentSlotConfig[i].nextWeapon);*/
+    /*   if (this->currentSlotConfig[i]->currentWeapon != NULL || this->currentSlotConfig[i]->nextWeapon != NULL)
+      printf("%p %p\n", this->currentSlotConfig[i]->currentWeapon, this->currentSlotConfig[i]->nextWeapon);*/
 
     // current Weapon in Slot i
-    tickWeapon = this->currentSlotConfig[i].currentWeapon;
+    tickWeapon = this->currentSlotConfig[i]->currentWeapon;
     // On A change (current != next)
-    if (tickWeapon != this->currentSlotConfig[i].nextWeapon)
+    if (tickWeapon != this->currentSlotConfig[i]->nextWeapon)
     {
       // if a Weapon is Active in slot i, deactivate it.
@@ -497 +500 @@
         {
           tickWeapon->toList(OM_NULL);
-          this->currentSlotConfig[i].currentWeapon = NULL;
+          this->currentSlotConfig[i]->currentWeapon = NULL;
         }
       }
       // switching to next Weapon
-      tickWeapon = this->currentSlotConfig[i].currentWeapon = this->currentSlotConfig[i].nextWeapon;
-      
+      tickWeapon = this->currentSlotConfig[i]->currentWeapon = this->currentSlotConfig[i]->nextWeapon;
+
       if (tickWeapon != NULL)
       {
@@ -508 +511 @@
         tickWeapon->toList(this->parentEntity->getOMListNumber());
         tickWeapon->requestAction(WA_ACTIVATE);
-        this->currentSlotConfig[i].position.activateNode();
-        tickWeapon->setParent(&this->currentSlotConfig[i].position);
+        this->currentSlotConfig[i]->activateNode();
+        tickWeapon->setParent(this->currentSlotConfig[i]);
       }
       else
-        this->currentSlotConfig[i].position.deactivateNode();
+        this->currentSlotConfig[i]->deactivateNode();
       if (this->parentEntity != NULL && this->parentEntity->isA(Playable::staticClassID()))
         dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
     }
     else if (unlikely(tickWeapon != NULL && tickWeapon->getCurrentState() == WS_DEACTIVATING))
-      this->currentSlotConfig[i].nextWeapon = NULL;
+      this->currentSlotConfig[i]->nextWeapon = NULL;
   }
 }
@@ -531 +534 @@
   for (int i = 0; i < this->slotCount; i++)
   {
-    drawWeapon = this->currentSlotConfig[i].currentWeapon;
+    drawWeapon = this->currentSlotConfig[i]->currentWeapon;
     if( drawWeapon != NULL && drawWeapon->isVisible())
       drawWeapon->draw();
@@ -550 +553 @@
       {
         if( this->configs[configID][i] == NULL &&
-            (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
-            (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
+            (this->currentSlotConfig[i]->getCapability() & capability & WTYPE_ALLKINDS) &&
+            (this->currentSlotConfig[i]->getCapability() & capability & WTYPE_ALLDIRS))
           return i;
       }
@@ -560 +563 @@
     {
       if( this->configs[configID][i] == NULL &&
-          (this->currentSlotConfig[i].capability & capability & WTYPE_ALLKINDS) &&
-          (this->currentSlotConfig[i].capability & capability & WTYPE_ALLDIRS))
+          (this->currentSlotConfig[i]->getCapability() & capability & WTYPE_ALLKINDS) &&
+          (this->currentSlotConfig[i]->getCapability() & capability & WTYPE_ALLDIRS))
         return i;
     }
@@ -604 +607 @@
   }
 }
+
+
+long WeaponManager::getSlotCapability(int slot) const
+{
+  return this->currentSlotConfig[slot]->getCapability();
+}
+
+const Vector& WeaponManager::getSlotPosition(int slot) const
+{
+  return this->currentSlotConfig[slot]->getRelCoor();
+}
+
+Weapon* WeaponManager::getWeapon(int slotID) const
+{
+  return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID]->getNextWeapon(): NULL;
+}
+
+

trunk/src/world_entities/weapons/weapon_manager.h

@@ -21 +21 @@
 #include "ammo_container.h"
 
+
 // FORWARD DECLARATION
 template <class T> class tAnimation;
+class WeaponSlot;
 
 #define    WM_MAX_SLOTS            10             //!< How many slots the WeaponManager has at its max
@@ -40 +42 @@
 class WeaponManager : public BaseObject {
   ObjectListDeclaration(WeaponManager);
-
-  //! an enumerator defining a Slot, where a Weapon can be stored inside.
-  typedef struct
-  {
-    PNode         position;               //!< the relative Position to the position of the carrying entity. (const PNode* parent; of WeaponManager)
-    long          capability;             //!< the capabilities of the Slot @see WM_SlotCapability.
-
-    Weapon*       currentWeapon;          //!< The current weapon this slot is carrying.
-    Weapon*       nextWeapon;             //!< either NULL or the next weapon that will be set (require currentWeapon to deactivate)
-  } WM_Slot;
 
   public:
@@ -70 +62 @@
     void setSlotDirection(int slot, const Quaternion& rotation);
     /** @param slot the slot to get the relative position from @returns the relative position of the Carrier to the Slot */
-    const Vector& getSlotPosition(int slot) const { return this->currentSlotConfig[slot].position.getRelCoor(); };
+    const Vector& getSlotPosition(int slot) const;
     void setSlotCapability(int slot, long slotCapability);
     /** @param slot the slot to get the capabilities from @returns the capabilies */
-    long getSlotCapability(int slot) const { return this->currentSlotConfig[slot].capability; };
+    long getSlotCapability(int slot) const;
 
     void setParentEntity(WorldEntity* parent);
@@ -85 +77 @@
     void removeWeapon(Weapon* weapon, int configID = -1);
 
-    Weapon* getWeapon(int slotID) const { return (slotID >= 0 && slotID < this->slotCount)? this->currentSlotConfig[slotID].nextWeapon: NULL; };
+    Weapon* getWeapon(int slotID) const;
 
     // FIXME ::
@@ -122 +114 @@
     int                     currentConfigID;                          //!< the currently selected config.
     Weapon*                 configs[WM_MAX_CONFIGS][WM_MAX_SLOTS];    //!< An array of predefined configurations and assigned weapon.
-    WM_Slot                 currentSlotConfig[WM_MAX_SLOTS];          //!< The currentConfigureation.
+    WeaponSlot*             currentSlotConfig[WM_MAX_SLOTS];          //!< The currentConfigureation.
 
     Weapon*                 availiableWeapons[WM_MAX_LOADED_WEAPONS]; //!< The availiable Weapons of this WeaponManager