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

Timestamp:

Dec 3, 2006, 7:40:07 PM (17 years ago)

Author:

marcscha

Message:

multiple weapons, crosshair visibility → changelog

File:

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

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

@@ -127 +127 @@
 void SpaceShip::init()
 {
+
   //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->registerObject(this, SpaceShip::_objectList);
@@ -132 +133 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
+  secWeaponMan.showCrosshair();
+
   //weapons:
+
   Weapon* wpRight1 = new LightBlaster ();
   wpRight1->setName("Light Blaster Right");
@@ -139 +143 @@
 
   Weapon* wpRight2 = new MediumBlaster ();
-  wpRight2->setName("Light Blaster Right");
+  wpRight2->setName("Medium Blaster Right");
   Weapon* wpLeft2 = new MediumBlaster ();
   wpLeft2->setName("Medium Blaster Left");
@@ -158 +162 @@
   this->weaponMan.addWeapon( wpLeft3, 0, 4);
   this->weaponMan.addWeapon( wpRight3, 0, 5);
+
   this->secWeaponMan.addWeapon( cannon, 0, 0);
 
@@ -168 +173 @@
   wpRight3->requestAction(WA_ACTIVATE);
   wpLeft3->requestAction(WA_ACTIVATE);
+
   cannon->requestAction(WA_ACTIVATE);
 
@@ -294 +300 @@
   this->weaponMan.getFixedTarget()->setParent(this);
   this->weaponMan.getFixedTarget()->setRelCoor(100000,0,0);
-
+  
   this->secWeaponMan.getFixedTarget()->setParent(this);
   this->secWeaponMan.getFixedTarget()->setRelCoor(100000,0,0);