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

Timestamp:

Jan 24, 2007, 3:29:46 PM (18 years ago)

Author:

nicolasc

Message:

bump: black acid splash

File:

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

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

@@ -176 +176 @@
   spike->setName( "SpikeThrower" );
 
-//  Weapon* spike2 = new SpikeLauncher();
-//  spike2->setName( "SpikeLauncher" );
-
-  /*
+
   Weapon* acid0 = new AcidLauncher();
   acid0->setName( "AcidSplasher" );
@@ -185 +182 @@
   Weapon* acid1 = new AcidLauncher();
   acid1->setName( "AcidSplasher" );
-  */
+
 
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
@@ -195 +192 @@
   this->weaponMan.addWeapon( wpLeft3, 2, 4);
   this->weaponMan.addWeapon( wpRight3, 2, 5);
-
+/*
   this->weaponMan.addWeapon( wpLeft1, 3, 0);
   this->weaponMan.addWeapon( wpRight1, 3, 1);
@@ -204 +201 @@
   this->weaponMan.addWeapon( wpLeft3, 3, 4);
   this->weaponMan.addWeapon( wpRight3, 3, 5);
-
-  /*
-  this->weaponMan.addWeapon( acid0, 0, 6);
-  this->weaponMan.addWeapon( acid1, 0, 7);
-  */
+*/
+
+  this->weaponMan.addWeapon( acid0, 3, 0);
+  this->weaponMan.addWeapon( acid1, 3, 1);
+
 
   this->secWeaponMan.addWeapon( cannon, 0, 2);
@@ -216 +213 @@
 
 
-  this->weaponMan.changeWeaponConfig(0);
+  this->weaponMan.changeWeaponConfig(3);
   this->secWeaponMan.changeWeaponConfig(1);
 
-  curWeaponPrimary    = 3;
-  curWeaponSecondary  = 0;
+  curWeaponPrimary    = 0;
+  curWeaponSecondary  = 1;
 
   Playable::weaponConfigChanged();