Changeset 2391 for code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h

Timestamp:

Dec 10, 2008, 5:30:39 PM (15 years ago)

Author:

polakma

Message:

fixed projectile, particle effect, reloadingTimer and magazineTimer

File:

• code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.h (modified) (3 diffs)

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

@@ -40 +40 @@
 #include "Munition.h"
 
+#include "objects/worldentities/PositionableEntity.h"
+
 namespace orxonox
 {
-    class _OrxonoxExport Weapon : public BaseObject
+    class _OrxonoxExport Weapon : public PositionableEntity
     {
         public:
@@ -82 +84 @@
                 { return this->parentWeaponSystem_; };
 
-            //in future by XMLPort, 
+            //in future by XMLPort
             virtual void setWeapon();
 
@@ -92 +94 @@
             float bulletLoadingTime_;
             float magazineLoadingTime_;
+            bool bReloading_;
+
             Munition *munition_;
             std::string munitionType_;