Changeset 10648 in orxonox.OLD for branches/vs-enhencements/src/world_entities/space_ships

Timestamp:

May 4, 2007, 9:53:07 AM (18 years ago)

Author:

nicolasc

Message:

some additional weapons, started weapons cleanup

File:

• branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -27 +27 @@
 #include "weapons/heavy_blaster.h"
 #include "weapons/rf_cannon.h"
+#include "weapons/nadion_laser.h"
+#include "weapons/disruptor.h"
 #include "weapons/swarm_launcher.h"
 #include "weapons/spike_thrower.h"
@@ -166 +168 @@
   Weapon* wpLeft1 = new RFCannon ();
   wpLeft1->setName( "RFCannon");
-
+/*
   Weapon* wpRight2 = new MediumBlaster ();
   wpRight2->setName( "MediumBlaster");
   Weapon* wpLeft2 = new MediumBlaster ();
-  wpLeft2->setName( "MediumBlaster");
-
+  wpLeft2->setName( "MediumBlaster");*/
+
+  Weapon* wpRight2 = new NadionLaser ();
+  wpRight2->setName( "NadionLaser");
+  Weapon* wpLeft2 = new NadionLaser ();
+  wpLeft2->setName( "NadionLaser");
+/*
   Weapon* wpRight3 = new HeavyBlaster (1);
   wpRight3->setName( "HeavyBlaster");
   Weapon* wpLeft3 = new HeavyBlaster (0);
-  wpLeft3->setName( "HeavyBlaster");
+  wpLeft3->setName( "HeavyBlaster");*/
+
+  Weapon* wpRight3 = new Disruptor ();
+  wpRight3->setName( "Disruptor");
+  Weapon* wpLeft3 = new Disruptor ();
+  wpLeft3->setName( "Disruptor");
 
   Weapon* cannon = new SwarmLauncher();