Changeset 2186 for code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponSystem.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/WeaponSystem.h (modified) (3 diffs)

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

@@ -43 +43 @@
     {
         enum Enum
-        { LaserGunMunition };
+        { laserGunMunition };
     }
 
@@ -68 +68 @@
             //void setActiveWeaponSet(unsigned int n);
             WeaponSet * getWeaponSetPointer(unsigned int n);
+            Munition * getAttachedMunitionPointer();
 
             inline void setParentSpaceShip(SpaceShip *parentSpaceShip)
@@ -80 +81 @@
             WeaponSet *activeWeaponSet_;
             SpaceShip *parentSpaceShip_;
+            Munition * attachedMunition_;
     };
 }