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

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

@@ -35 +35 @@
 #include "Weapon.h"
 
+
 namespace orxonox
 {
@@ -40 +41 @@
     {
         RegisterObject(Weapon);
-
-        this->loadingTime_ = 0;
-        this->munition_ = 0;
+        this->weaponReadyToShoot_ = true;
+        //this->setParentWeaponSystem();
 
     }
@@ -50 +50 @@
     }
 
-    void Weapon::addMunition()
-    {
-
-    }
 
     void Weapon::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -64 +60 @@
 
     }
+
+    void Weapon::reloaded()
+    {
+        this->weaponReadyToShoot_ = true;
+    }
+
+    void Weapon::attachNeededMunition(Munition *PointerToMunition)
+    {
+
+    }
+/*
+    void Weapon::setParentWeaponSystem()
+    {
+        this->parentWeaponSystem_ = this->parentWeaponSlot_->parentWeaponSet_->parentWeaponSystem_;
+    }
+*/
+
 }