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

Timestamp:

Nov 12, 2008, 4:45:50 PM (17 years ago)

Author:

polakma

Message:

added munition, fixed reloadTimer_

File:

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

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

@@ -52 +52 @@
         this->activeWeaponSet_ = 0;
         this->parentSpaceShip_ = 0;
-        this->attachedMunition_ =0;
     }
 
@@ -64 +63 @@
         wSet->setParentWeaponSystem(this);
     }
+
+    void WeaponSystem::setNewMunition(std::string munitionType, Munition * munitionToAdd)
+    {
+        this->munitionSet_[munitionType] = munitionToAdd;
+    }
+    Munition * WeaponSystem::getMunitionType(std::string munitionType)
+    {
+        return this->munitionSet_[munitionType];
+    }
+
 
 /*
@@ -98 +107 @@
     }
 
-    Munition * WeaponSystem::getAttachedMunitionPointer()
-    {
-        return this->attachedMunition_;
-    }
-
-    void WeaponSystem::addMunitionType(Munition *munitionPointer)
-    {
-
-
-        if (munitionPointer != NULL)  //gewährleiste, dass munitionPointer auf etwas sinnvolles zeigt
-            this->attachedMunition_ = munitionPointer;
-        else
-            ;//was?
-
-    }
-
-
 }