Changeset 10224 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Jan 10, 2007, 5:33:19 PM (18 years ago)

Author:

nicolasc

Message:

bump

File:

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

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

@@ -175 +175 @@
   cannon->setName( "SwarmLauncher");
 
-  Weapon* spike = new SpikeLauncher();
+  Weapon* spike = new SpikeThrower();
   spike->setName( "SpikeThrower" );
 
+  Weapon* spike2 = new SpikeLauncher();
+  spike->setName( "SpikeLauncher" );
 
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
@@ -199 +201 @@
   this->secWeaponMan.addWeapon( cannon, 0, 0);
   this->secWeaponMan.addWeapon( spike, 1, 1);
+  this->secWeaponMan.addWeapon( spike2, 2, 2);
 
   
@@ -205 +208 @@
 
   curWeaponPrimary    = 3;
-  curWeaponSecondary  = 0;
+  curWeaponSecondary  = 2;
 
   Playable::weaponConfigChanged();