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

Timestamp:

Jan 28, 2006, 11:29:03 AM (20 years ago)

Author:

bensch

Message:

trunk: remastered Playables a bit

File:

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

trunk/src/world_entities/space_ships/space_ship.cc

@@ -306 +306 @@
 void SpaceShip::tick (float time)
 {
-  this->getWeaponManager()->tick(time);
-  // weapon system manipulation
-  this->weaponAction();
+  Playable::tick(time);
 
   if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == this->getHostID() )
@@ -464 +462 @@
 
 /**
- * weapon manipulation by the player
-*/
-void SpaceShip::weaponAction()
-{
-  if( this->bFire)
-    {
-      this->getWeaponManager()->fire();
-    }
-}
-
-/**
  * @todo switch statement ??
  */
 void SpaceShip::process(const Event &event)
 {
+  Playable::process(event);
+
   if( event.type == KeyMapper::PEV_LEFT)
       this->bRollL = event.bPressed;
   else if( event.type == KeyMapper::PEV_RIGHT)
       this->bRollR = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1)
-      this->bFire = event.bPressed;
-  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
-  {
-    this->nextWeaponConfig();//if( !event.bPressed) this->bWeaponChange = !this->bWeaponChange;
-  }
-  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
-    this->previousWeaponConfig();
   else if( event.type == KeyMapper::PEV_UP)
     this->bUp = event.bPressed; //this->shiftCoor(0,.1,0);