Changeset 6443 in orxonox.OLD for trunk/src/world_entities/space_ships/space_ship.cc

Timestamp:

Jan 8, 2006, 5:44:04 PM (20 years ago)

Author:

bensch

Message:

huge pipeline

File:

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

trunk/src/world_entities/space_ships/space_ship.cc

@@ -103 +103 @@
   cannon->setName("BFG");
 
-  this->getWeaponManager()->addWeapon(wpLeft, 1, 0);
-  this->getWeaponManager()->addWeapon(wpRight,1 ,1);
-  this->getWeaponManager()->addWeapon(cannon, 0, 6);
-
-  //this->getWeaponManager()->addWeapon(turret, 3, 0);
+  this->addWeapon(wpLeft, 1, 0);
+  this->addWeapon(wpRight,1 ,1);
+  this->addWeapon(cannon, 0, 6);
+
+  //this->addWeapon(turret, 3, 0);
 
   this->getWeaponManager()->changeWeaponConfig(1);
@@ -221 +221 @@
 }
 
-/**
- * adds a weapon to the weapon list of the spaceship
- * @param weapon to add
-*/
-void SpaceShip::addWeapon(Weapon* weapon)
-{
-  this->getWeaponManager()->addWeapon(weapon);
-}
-
-
-/**
- *  removes a weapon from the spaceship
- * @param weapon to remove
-*/
-void SpaceShip::removeWeapon(Weapon* weapon)
-{
-  this->getWeaponManager()->removeWeapon(weapon);
-}
 
 /**
@@ -451 +433 @@
       this->bFire = event.bPressed;
   else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
+  {
     this->getWeaponManager()->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
+  }
   else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
     this->getWeaponManager()->previousWeaponConfig();
@@ -503 +487 @@
     {
       turret = new Turret();
-      this->getWeaponManager()->addWeapon(turret, 2);
+      this->addWeapon(turret, 2);
       this->getWeaponManager()->changeWeaponConfig(2);
     }
@@ -513 +497 @@
       turret = dynamic_cast<Weapon*>(Factory::fabricate(CL_TARGETING_TURRET));
       if (turret != NULL)
-      this->getWeaponManager()->addWeapon(turret, 3);
+      this->addWeapon(turret, 3);
 
       this->getWeaponManager()->changeWeaponConfig(3);