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

Timestamp:

Apr 9, 2009, 3:18:11 AM (16 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/WeaponPack.cc (modified) (5 diffs)

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

@@ -27 +27 @@
 
 #include "OrxonoxStableHeaders.h"
-
-#include <vector>
+#include "WeaponPack.h"
 
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "util/Debug.h"
+#include "objects/worldentities/pawns/Pawn.h"
 
-#include "WeaponPack.h"
-#include "objects/worldentities/pawns/Pawn.h"
+#include "Weapon.h"
+#include "WeaponSlot.h"
 
 namespace orxonox
@@ -45 +44 @@
         RegisterObject(WeaponPack);
 
-        this->parentWeaponSystem_ = 0;
+        this->weaponSystem_ = 0;
         this->firemode_ = 0;
 
+COUT(0) << "+WeaponPack" << std::endl;
     }
 
     WeaponPack::~WeaponPack()
     {
+COUT(0) << "~WeaponPack" << std::endl;
     }
 
-    int WeaponPack::getSize()
+    void WeaponPack::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(WeaponPack, XMLPort, xmlelement, mode);
+
+        XMLPortObject(WeaponPack, Weapon, "", addWeapon, getWeapon, xmlelement, mode);
+        XMLPortParam(WeaponPack, "firemode", setFireMode, getFireMode, xmlelement, mode);
+    }
+
+    int WeaponPack::getSize() const
     {
         return this->weapons_.size();
@@ -67 +76 @@
     }
 
-    Weapon * WeaponPack::getWeaponPointer(unsigned int n)
+    Weapon * WeaponPack::getWeaponPointer(unsigned int n) const
     {
         return this->weapons_[n];
-    }
-
-    void WeaponPack::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(WeaponPack, XMLPort, xmlelement, mode);
-
-        XMLPortObject(WeaponPack, Weapon, "", addWeapon, getWeapon, xmlelement, mode);
-        XMLPortParam(WeaponPack, "firemode", setFireMode, getFireMode, xmlelement, mode);
     }
 
@@ -85 +86 @@
     }
 
-    unsigned int WeaponPack::getFireMode()
+    unsigned int WeaponPack::getFireMode() const
     {
         return this->firemode_;
@@ -95 +96 @@
     }
 
-    const Weapon * WeaponPack::getWeapon(unsigned int index)
+    const Weapon * WeaponPack::getWeapon(unsigned int index) const
     {
         return weapons_[index];
     }
 
-    void WeaponPack::setParentWeaponSystemToAllWeapons(WeaponSystem * weaponSystem)
+    void WeaponPack::setWeaponSystemToAllWeapons(WeaponSystem * weaponSystem)
     {
-        for (int i=0; i < (int) this->weapons_.size(); i++)
-        {
-            this->weapons_[i]->setParentWeaponSystem(weaponSystem);
-        }
-
+        for (size_t i = 0; i < this->weapons_.size(); i++)
+            this->weapons_[i]->setWeaponSystem(weaponSystem);
     }
 
     void WeaponPack::attachNeededMunitionToAllWeapons()
     {
-        for (int i=0; i < (int) this->weapons_.size(); i++)
+        for (size_t i = 0; i < this->weapons_.size(); i++)
         {
             this->weapons_[i]->attachNeededMunition(weapons_[i]->getMunitionType());
             this->weapons_[i]->setWeapon();
         }
-
     }
-
 }