Changeset 6998 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 3, 2006, 12:29:57 AM (19 years ago)

Author:

bensch

Message:

trunk: more button definitions

Location:

trunk/src/world_entities

Files:

• player.cc (modified) (2 diffs)
• space_ships/hover.cc (modified) (2 diffs)

trunk/src/world_entities/player.cc

@@ -40 +40 @@
   this->hud.show();
 
-  EventHandler::getInstance()->subscribe(this, ES_GAME, SDLK_l);
+  EventHandler::getInstance()->subscribe(this, ES_GAME, KeyMapper::PEV_CHANGE_SHIP);
 }
 
@@ -98 +98 @@
  void Player::process(const Event &event)
  {
-   if (event.type == SDLK_l && event.bPressed)
+   if (event.type == KeyMapper::PEV_CHANGE_SHIP && event.bPressed)
    {
      /// FIXME this should be in the ObjectManager

trunk/src/world_entities/space_ships/hover.cc

@@ -145 +145 @@
   registerEvent(KeyMapper::PEV_LEFT);
   registerEvent(KeyMapper::PEV_RIGHT);
-  registerEvent(SDLK_e); /// FIXME
-  registerEvent(SDLK_c); /// FIXME
+  registerEvent(KeyMapper::PEV_UP);
+  registerEvent(KeyMapper::PEV_DOWN);
   registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(KeyMapper::PEV_NEXT_WEAPON);
@@ -362 +362 @@
   else if( event.type == KeyMapper::PEV_RIGHT)
     this->bRight = event.bPressed;
-  else if( event.type == SDLK_e)
+  else if( event.type == KeyMapper::PEV_UP)
     this->bAscend = event.bPressed; //this->shiftCoor(0,.1,0);
-  else if( event.type == SDLK_c)
+  else if( event.type == KeyMapper::PEV_DOWN)
     this->bDescend = event.bPressed; //this->shiftCoor(0,-.1,0);
   else if( event.type == KeyMapper::PEV_FORWARD)