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

Timestamp:

Dec 27, 2006, 12:03:36 PM (18 years ago)

Author:

nicolasc

Message:

finished animation on heavy blaster, started light blaster
code needs some cleanup

File:

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

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

@@ -161 +161 @@
   //wpLeft2->setParent( this);
   
-  Weapon* wpRight3 = new HeavyBlaster ();
+  Weapon* wpRight3 = new HeavyBlaster (1);
   wpRight3->setName( "HeavyBlaster");
   //wpRight3->setParent( this);
-  Weapon* wpLeft3 = new HeavyBlaster ();
+  Weapon* wpLeft3 = new HeavyBlaster (0);
   wpLeft3->setName( "HeavyBlaster");
   //wpLeft3->setParent( this);
@@ -182 +182 @@
   this->weaponMan.addWeapon( wpRight3, 2, 5);
 
+  this->weaponMan.addWeapon( wpLeft1, 3, 0);
+  this->weaponMan.addWeapon( wpRight1, 3, 1);
+
+  this->weaponMan.addWeapon( wpLeft2, 3, 2);
+  this->weaponMan.addWeapon( wpRight2, 3, 3);
+
+  this->weaponMan.addWeapon( wpLeft3, 3, 4);
+  this->weaponMan.addWeapon( wpRight3, 3, 5);
+
   this->secWeaponMan.addWeapon( cannon, 0, 0);
 
   
-  this->weaponMan.changeWeaponConfig(2);
+  this->weaponMan.changeWeaponConfig(3);
   this->secWeaponMan.changeWeaponConfig(0);
 
@@ -274 +283 @@
   this->weaponMan.setSlotCount(6);
 
-  this->weaponMan.setSlotPosition(0, Vector(-2.6, 0, -3.0));
+  this->weaponMan.setSlotPosition(0, Vector(0.0, 0, -3.0));
   this->weaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
-  this->weaponMan.setSlotPosition(1, Vector(-2.6, 0, 3.0));
+  this->weaponMan.setSlotPosition(1, Vector(0.0, 0, 3.0));
   this->weaponMan.setSlotCapability(1, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);