Changeset 3053 for code/trunk/src/orxonox/OrxonoxPrereqs.h

Timestamp:

May 25, 2009, 4:19:14 AM (15 years ago)

Author:

landauf

Message:

merged weapons branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (2 diffs)

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -74 +74 @@
     }
 
-    //put here all existing munitionTypes
-    namespace MunitionType
-    {
-        enum Enum
-        { laserGunMunition };
-    }
-
-    //put here all weapon fire modes.
-    //they have to be added to Pawn and HumanController, too.
-    namespace WeaponMode
-    {
-        enum Enum
-        {
-            fire     = 0x1,
-            altFire  = 0x2,
-            altFire2 = 0x4
-        };
-    }
-
-
     class GraphicsManager;
     class OgreWindowEventListener;
@@ -182 +162 @@
     class WeaponPack;
     class Weapon;
+    class WeaponMode;
+    class DefaultWeaponmodeLink;
+    class MuzzleFlash;
+
+    class LaserFire;
+    class FusionFire;
+    class HsW01;
+    class LightningGun;
+    class EnergyDrink;
+
+    class ReplenishingMunition;
     class Munition;
-    class LaserGun;
-    class LaserGunMunition;
+    class LaserMunition;
     class FusionMunition;
+
+    class Projectile;
+    class BillboardProjectile;
+    class ParticleProjectile;
+    class LightningGunProjectile;
 
     class EventListener;