Changeset 10196 in orxonox.OLD for branches/playability/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 8, 2007, 9:46:13 PM (18 years ago)

Author:

nicolasc

Message:

just another upload
GUI seems to work, but there are still some unexplainable segfaults

File:

• branches/playability/src/world_entities/space_ships/space_ship.cc (modified) (3 diffs)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -28 +28 @@
 #include "weapons/swarm_launcher.h"
 #include "weapons/spike_launcher.h"
+#include "weapons/spike_thrower.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -173 +174 @@
   Weapon* cannon = new SwarmLauncher();
   cannon->setName( "SwarmLauncher");
-  //cannon->setParent( this);
+
+  Weapon* spike = new SpikeLauncher();
+  spike->setName( "SpikeThrower" );
 
 
@@ -195 +198 @@
 
   this->secWeaponMan.addWeapon( cannon, 0, 0);
+  this->secWeaponMan.addWeapon( spike, 1, 1);