Changeset 2912 for code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc

Timestamp:

Apr 9, 2009, 3:18:11 AM (15 years ago)

Author:

landauf

Message:

Several small adjustments in the weaponsystem (like additional const keyword, includes moved from .h to .cc where possible, …)

Firemode is now an unsigned int instead of an Enum. Instead of "fire" and "altFire" use "fire 0" and "fire 1"

File:

• code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) (4 diffs)

code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponSet.cc

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
-
-#include <vector>
+#include "WeaponSet.h"
 
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "util/Debug.h"
 #include "objects/worldentities/pawns/Pawn.h"
 
-#include "WeaponSet.h"
+#include "Weapon.h"
+#include "WeaponSlot.h"
 #include "WeaponPack.h"
+#include "WeaponSystem.h"
 
 namespace orxonox
@@ -46 +46 @@
         RegisterObject(WeaponSet);
 
-        this->parentWeaponSystem_ = 0;
+        this->weaponSystem_ = 0;
         this->attachedWeaponPack_ = 0;
+
+COUT(0) << "+WeaponSet" << std::endl;
     }
 
     WeaponSet::~WeaponSet()
     {
+COUT(0) << "~WeaponSet" << std::endl;
+    }
+
+    void WeaponSet::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(WeaponSet, XMLPort, xmlelement, mode);
+
+        XMLPortParam(WeaponSet, "firemode", setFireMode, getFireMode, xmlelement, mode);
     }
 
     void WeaponSet::attachWeaponPack(WeaponPack *wPack)
     {
-        if ( this->parentWeaponSystem_->getWeaponSlotSize()>0 && wPack->getSize()>0 && ( wPack->getSize() <= this->parentWeaponSystem_->getWeaponSlotSize() ) )
+        if ( this->weaponSystem_->getWeaponSlotSize()>0 && wPack->getSize()>0 && ( wPack->getSize() <= this->weaponSystem_->getWeaponSlotSize() ) )
         {
             this->attachedWeaponPack_ = wPack;
             int wPackWeapon = 0;    //WeaponCounter for Attaching
-           
+
             //should be possible to choose which slot to use
             //attach every weapon of the weaponPack to a weaponSlot
@@ -67 +77 @@
                 //at the moment this function only works for one weaponPack in the entire WeaponSystem...
                 //it also takes the first free weaponSlot...
-                if ( this->parentWeaponSystem_->getWeaponSlotPointer(i)->getAttachedWeapon() == 0 && this->parentWeaponSystem_->getWeaponSlotPointer(i) != 0) //if slot not full
+                if ( this->weaponSystem_->getWeaponSlot(i)->getAttachedWeapon() == 0 && this->weaponSystem_->getWeaponSlot(i) != 0) //if slot not full
                 {
-                    this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(i) );
-                    this->parentWeaponSystem_->getWeaponSlotPointer(i)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
-                    this->parentWeaponSystem_->getParentPawn()->attach( wPack->getWeaponPointer(wPackWeapon) );
+                    this->setWeaponSlots_.push_back( this->weaponSystem_->getWeaponSlot(i) );
+                    this->weaponSystem_->getWeaponSlot(i)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
+                    this->weaponSystem_->getPawn()->attach( wPack->getWeaponPointer(wPackWeapon) );
                     wPackWeapon++;
                 }
                 else
                 {
-                    for (int k=0; k < this->parentWeaponSystem_->getWeaponSlotSize(); k++)
+                    for (int k=0; k < this->weaponSystem_->getWeaponSlotSize(); k++)
                     {
-                        if ( this->parentWeaponSystem_->getWeaponSlotPointer(k)->getAttachedWeapon() == 0 )
+                        if ( this->weaponSystem_->getWeaponSlot(k)->getAttachedWeapon() == 0 )
                         {
-                            this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(k) );
-                            this->parentWeaponSystem_->getWeaponSlotPointer(k)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
-                            this->parentWeaponSystem_->getParentPawn()->attach( wPack->getWeaponPointer(wPackWeapon) );
+                            this->setWeaponSlots_.push_back( this->weaponSystem_->getWeaponSlot(k) );
+                            this->weaponSystem_->getWeaponSlot(k)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
+                            this->weaponSystem_->getPawn()->attach( wPack->getWeaponPointer(wPackWeapon) );
                             wPackWeapon++;
                         }
@@ -98 +108 @@
             this->attachedWeaponPack_->fire();
     }
-
-    void WeaponSet::setFireMode(const unsigned int firemode)
-    {   this->firemode_ = firemode; }
-
-    const unsigned int WeaponSet::getFireMode() const
-    {   return this->firemode_; }
-
-    void WeaponSet::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(WeaponSet, XMLPort, xmlelement, mode);
-        XMLPortParam(WeaponSet, "firemode", setFireMode, getFireMode, xmlelement, mode);
-    }
-
 }