Changeset 2912 for code/branches/weapons/src/orxonox/objects/weaponSystem/Weapon.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/Weapon.cc (modified) (12 diffs)

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

@@ -28 +28 @@
 
 #include "OrxonoxStableHeaders.h"
+#include "Weapon.h"
 
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "util/Debug.h"
-
-#include "Weapon.h"
+
+#include "Munition.h"
+#include "WeaponSystem.h"
 
 namespace orxonox
@@ -45 +46 @@
         this->bulletReadyToShoot_ = true;
         this->magazineReadyToShoot_ = true;
-        this->parentWeaponSystem_ = 0;
+        this->weaponSystem_ = 0;
         this->attachedToWeaponSlot_ = 0;
         this->bulletLoadingTime_ = 0;
@@ -55 +56 @@
         this->unlimitedMunition_ = false;
         this->setObjectMode(0x0);
+
+COUT(0) << "+Weapon" << std::endl;
     }
 
     Weapon::~Weapon()
     {
-    }
-
+COUT(0) << "~Weapon" << std::endl;
+    }
 
     void Weapon::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -152 +155 @@
 
 
-    void Weapon::attachNeededMunition(std::string munitionName)
+    void Weapon::attachNeededMunition(const std::string& munitionName)
     {
         /*  if munition type already exists attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
         */
-        if (this->parentWeaponSystem_)
+        if (this->weaponSystem_)
         {
             //getMunitionType returns 0 if there is no such munitionType
-            Munition* munition = this->parentWeaponSystem_->getMunitionType(munitionName);
+            Munition* munition = this->weaponSystem_->getMunitionType(munitionName);
             if ( munition )
             {
@@ -170 +173 @@
                 this->munitionIdentifier_ = ClassByString(munitionName);
                 this->munition_ = this->munitionIdentifier_.fabricate(this);
-                this->parentWeaponSystem_->setNewMunition(munitionName, this->munition_);
+                this->weaponSystem_->setNewMunition(munitionName, this->munition_);
                 this->setMunition();
             }
@@ -177 +180 @@
 
 
-    Munition * Weapon::getAttachedMunition(std::string munitionType)
-    {
-        this->munition_ = this->parentWeaponSystem_->getMunitionType(munitionType);
+    Munition * Weapon::getAttachedMunition(const std::string& munitionType)
+    {
+        this->munition_ = this->weaponSystem_->getMunitionType(munitionType);
         return this->munition_;
     }
@@ -193 +196 @@
 
     //get and set functions for XMLPort
-    void Weapon::setMunitionType(std::string munitionType)
+    void Weapon::setMunitionType(const std::string& munitionType)
     {   this->munitionType_ = munitionType; }
 
-    const std::string Weapon::getMunitionType()
+    const std::string& Weapon::getMunitionType() const
     {   return this->munitionType_;  }
 
@@ -202 +205 @@
     {   this->bulletLoadingTime_ = loadingTime; }
 
-    const float Weapon::getBulletLoadingTime()
+    const float Weapon::getBulletLoadingTime() const
     {   return this->bulletLoadingTime_;  }
 
@@ -208 +211 @@
     {   this->magazineLoadingTime_ = loadingTime; }
 
-    const float Weapon::getMagazineLoadingTime()
+    const float Weapon::getMagazineLoadingTime() const
     {   return this->magazineLoadingTime_;  }
 
@@ -214 +217 @@
     {   this->bulletAmount_ = amount; }
 
-    const unsigned int Weapon::getBulletAmount()
+    const unsigned int Weapon::getBulletAmount() const
     {   return this->bulletAmount_;  }
 
@@ -220 +223 @@
     {   this->magazineAmount_ = amount; }
 
-    const unsigned int Weapon::getMagazineAmount()
+    const unsigned int Weapon::getMagazineAmount() const
     {   return this->magazineAmount_;   }
 
@@ -226 +229 @@
     {   this->unlimitedMunition_ = unlimitedMunition;   }
 
-    const bool Weapon::getUnlimitedMunition()
+    const bool Weapon::getUnlimitedMunition() const
     {   return this->unlimitedMunition_;    }