Changeset 2145 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc

Timestamp:

Nov 5, 2008, 7:57:16 PM (15 years ago)

Author:

polakma

Message:

added firemodes and a lot of other things

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (7 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.cc

@@ -45 +45 @@
 namespace orxonox
 {
+
     WeaponSystem::WeaponSystem(BaseObject* creator) : BaseObject(creator)
     {
@@ -51 +52 @@
         this->activeWeaponSet_ = 0;
         this->parentSpaceShip_ = 0;
+        //this->attachedMunition_ =0;
     }
 
@@ -57 +59 @@
     }
 
-    //creates empty weaponSet
     void WeaponSystem::attachWeaponSet(WeaponSet *wSet)
     {
@@ -64 +65 @@
     }
 
+/*
     //the first weaponSet is at n=0
     void WeaponSystem::setActiveWeaponSet(unsigned int n)
@@ -69 +71 @@
         if (n < this->weaponSets_.size())
             this->activeWeaponSet_ = this->weaponSets_[n];
+        else
+            this->activeWeaponSet_ = this->weaponSets_[0];
     }
+*/
 
     //n is the n'th weaponSet, starting with zero
-    //Spaceship.cc only needs to have the keybinding to a specific Set-number n
-    void WeaponSystem::fire(unsigned int n)
+    //SpaceShip.cc only needs to have the keybinding to a specific Set-number n
+    void WeaponSystem::fire(WeaponMode::Enum n)
     {
         if (n < this->weaponSets_.size())
@@ -79 +84 @@
     }
 
-    void WeaponSystem::fire()
-    {
-        if (this->activeWeaponSet_)
-            this->activeWeaponSet_->fire();
-    }
 
     WeaponSet * WeaponSystem::getWeaponSetPointer(unsigned int n)
@@ -98 +98 @@
     }
 
+    /*
+    void WeaponSystem::addMunitionType(Munition *munitionPointer)
+    {
+
+
+        if (munitionPointer != NULL)  //gewährleiste, dass munitionPointer auf etwas sinnvolles zeigt
+            this->attachedMunition_ = munitionPointer;
+        else
+            this->unlimitedAmmo_ = true;
+
+    }
+    */
+
 }