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

Timestamp:

Nov 12, 2008, 12:50:18 PM (15 years ago)

Author:

polakma

Message:

made some changes (still doesn't compile)

File:

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

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

@@ -48 +48 @@
             virtual void fire();
             void reloaded();
-            virtual void attachNeededMunition(Munition *PointerToMunition);
+            virtual void setParentWeaponSystem();
+            void attachNeededMunition(Munition *munitionPointer);
 
             inline void setParentWeaponSlot(WeaponSlot *parentWeaponSlot)
@@ -55 +56 @@
                 { return parentWeaponSlot_; };
 
-            //void setParentWeaponSystem();
+
+
 
         private:
@@ -62 +64 @@
             Munition *pointerToMunition_;
             WeaponSlot *parentWeaponSlot_;
-            //WeaponSystem *parentWeaponSystem_;
+            WeaponSystem *parentWeaponSystem_;
             Timer<Weapon> reloadTimer_;