Changeset 2098 for code/trunk/src/orxonox/objects/weaponSystem

Timestamp:

Nov 1, 2008, 11:17:22 PM (16 years ago)

Author:

landauf

Message:

• added a WeaponSystem to Pawn
• initialized values in weapon classes and fixed some vector limit conditions

Location:

code/trunk/src/orxonox/objects/weaponSystem

Files:

• Weapon.cc (modified) (1 diff)
• Weapon.h (modified) (1 diff)
• WeaponSet.cc (modified) (2 diffs)
• WeaponSet.h (modified) (1 diff)
• WeaponSlot.cc (modified) (1 diff)
• weapons/LaserGun.h (modified) (1 diff)
• weapons/Missile.h (modified) (1 diff)

code/trunk/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -40 +40 @@
     {
         RegisterObject(Weapon);
+
+        this->loadingTime_ = 0;
+        this->munition_ = 0;
+
     }
 

code/trunk/src/orxonox/objects/weaponSystem/Weapon.h

@@ -49 +49 @@
 
         private:
-            int loadingTime;
+            int loadingTime_;
             Munition *munition_;
 

code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.cc

@@ -42 +42 @@
         RegisterObject(WeaponSet);
 
+        this->parentWeaponSystem_ = 0;
+
         for (int i=0;i<k;i++)
         {
@@ -68 +70 @@
     }
 
-    WeaponSlot * WeaponSet::getWeaponSlotPointer(int n)
+    WeaponSlot * WeaponSet::getWeaponSlotPointer(unsigned int n)
     {
-        return this->weaponSlots_[n];
+        if (n < this->weaponSlots_.size())
+            return this->weaponSlots_[n];
+        else
+            return 0;
     }
 

code/trunk/src/orxonox/objects/weaponSystem/WeaponSet.h

@@ -50 +50 @@
             void WeaponSet::attachWeaponSlot(WeaponSlot *wSlot);
             void WeaponSet::fire();
-            WeaponSlot * getWeaponSlotPointer(int n);
+            WeaponSlot * getWeaponSlotPointer(unsigned int n);
 
             inline void WeaponSet::setParentWeaponSystem(WeaponSystem *parentWeaponSystem)

code/trunk/src/orxonox/objects/weaponSystem/WeaponSlot.cc

@@ -42 +42 @@
     {
         RegisterObject(WeaponSlot);
+
+        this->unlimitedAmmo_ = false;
+
+        this->attachedWeapon_ = 0;
+        this->parentWeaponSet_ = 0;
     }
 

code/trunk/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -35 +35 @@
 
 #include "LaserGunMunition.h"
-#include "../tools/BillboardSet.h"
+#include "tools/BillboardSet.h"
+#include "util/Math.h"
 
 namespace orxonox

code/trunk/src/orxonox/objects/weaponSystem/weapons/Missile.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 
-#include "core/BaseObject.h"
+#include "objects/weaponSystem/Weapon.h"
 
 
 namespace orxonox
 {
-    class _OrxonoxExport Missile : public BaseObject : public Weapon
+    class _OrxonoxExport Missile : public Weapon
     {
         public: