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

Timestamp:

Jan 17, 2007, 1:41:51 PM (18 years ago)

Author:

nicolasc

Message:

bump

File:

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

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

@@ -166 +166 @@
   wpLeft2->setName( "MediumBlaster");
   //wpLeft2->setParent( this);
-  
+
   Weapon* wpRight3 = new HeavyBlaster (1);
   wpRight3->setName( "HeavyBlaster");
@@ -177 +177 @@
   cannon->setName( "SwarmLauncher");
 
-//   Weapon* spike = new SpikeThrower();
-//   spike->setName( "SpikeThrower" );
+  Weapon* spike = new SpikeThrower();
+  spike->setName( "SpikeThrower" );
 
   Weapon* spike2 = new SpikeLauncher();
@@ -202 +202 @@
 
   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(2);
@@ -226 +226 @@
   shieldCur         = 20;
   shieldMax         = 100;
-  shieldTH          = .2* shieldMax;   // shield power must be 20% before shield kicks in again
+  shieldTH          = .2 * shieldMax;   // shield power must be 20% before shield kicks in again
 
   this->setHealth( 20);