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

Timestamp:

Dec 3, 2006, 10:36:50 PM (17 years ago)

Author:

marcscha

Message:

see 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

@@ -26 +26 @@
 #include "weapons/medium_blaster.h"
 #include "weapons/heavy_blaster.h"
+#include "weapons/swarm_missile.h"
 #include "weapons/boomerang_gun.h"
 #include "weapons/turret.h"
@@ -152 +153 @@
   wpLeft3->setName("Heavy Blaster Left");
 
-  Weapon* cannon = new BoomerangGun();//Cannon();
-  cannon->setName("End of World");
+  Weapon* cannon = new SwarmMissile();
+  cannon->setName("Swarm Missile");
+  
 
 
@@ -273 +275 @@
   this->secWeaponMan.setSlotCount(6);
 
-  this->secWeaponMan.setSlotPosition(0, Vector(2.6, -2.5, 0));
+  this->secWeaponMan.setSlotPosition(0, Vector(1.5, -1, 0));
   this->secWeaponMan.setSlotCapability(0, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 
@@ -300 +302 @@
   this->weaponMan.getFixedTarget()->setParent(this);
   this->weaponMan.getFixedTarget()->setRelCoor(100000,0,0);
+
   
   this->secWeaponMan.getFixedTarget()->setParent(this);
   this->secWeaponMan.getFixedTarget()->setRelCoor(100000,0,0);
+  this->secWeaponMan.setRotationSpeed(0);
 
   dynamic_cast<Element2D*>(this->weaponMan.getFixedTarget())->setVisibility( false);
@@ -367 +371 @@
 void SpaceShip::enter()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( true);
+  this->secWeaponMan.showCrosshair();
+  //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
   this->attachCamera();
 }
@@ -373 +378 @@
 void SpaceShip::leave()
 {
-  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+  this->secWeaponMan.hideCrosshair();
+  //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( false);
   this->detachCamera();
 }