Changeset 6804 in orxonox.OLD for trunk/src/world_entities/space_ships/hover.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/hover.cc (modified) (6 diffs)

trunk/src/world_entities/space_ships/hover.cc

@@ -252 +252 @@
  * @param time The timespan passed since last update
 */
-void Hover::tick (float time)
-{
+void Hover::tick (float dt)
+{
+  Playable::tick(dt);
+
   if( xMouse != 0 || yMouse != 0)
    {
@@ -263 +265 @@
 
   // spaceship controlled movement
-  this->calculateVelocity(time);
-
-  Vector move = (velocity)*time;
+  this->calculateVelocity(dt);
+
+  Vector move = (velocity)*dt;
 
   // this is the air friction (necessary for a smooth control)
@@ -271 +273 @@
   this->shiftCoor (move);
 
-  this->getWeaponManager()->tick(time);
-  // weapon system manipulation
-  this->weaponAction();
 }
 
@@ -400 +399 @@
 {
   Vector tmpRot;
-
   WorldEntity::draw();
 
@@ -463 +461 @@
 void Hover::process(const Event &event)
 {
-
+  Playable::process(event);
 
   if( event.type == KeyMapper::PEV_LEFT)
@@ -469 +467 @@
   else if( event.type == KeyMapper::PEV_RIGHT)
       this->bRight = event.bPressed;
-  else if( event.type == KeyMapper::PEV_FIRE1)
-      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();
   else if( event.type == SDLK_e)
     this->bAscend = event.bPressed; //this->shiftCoor(0,.1,0);