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

Timestamp:

Jan 14, 2007, 4:34:23 PM (17 years ago)

Author:

nicolasc

Message:

inital upload of projectile_weapon, started usage in spike_ball

File:

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

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

@@ -176 +176 @@
   cannon->setName( "SwarmLauncher");
 
-  Weapon* spike = new SpikeThrower();
-  spike->setName( "SpikeThrower" );
+//   Weapon* spike = new SpikeThrower();
+//   spike->setName( "SpikeThrower" );
 
   Weapon* spike2 = new SpikeLauncher();
-  spike->setName( "SpikeLauncher" );
+  spike2->setName( "SpikeLauncher" );
 
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
@@ -201 +201 @@
 
   this->secWeaponMan.addWeapon( cannon, 0, 0);
-  this->secWeaponMan.addWeapon( spike, 1, 1);
+/*  this->secWeaponMan.addWeapon( spike, 1, 1);*/
   this->secWeaponMan.addWeapon( spike2, 2, 2);
 
   
   this->weaponMan.changeWeaponConfig(3);
-  this->secWeaponMan.changeWeaponConfig(1);
+  this->secWeaponMan.changeWeaponConfig(2);
 
   curWeaponPrimary    = 3;