Changeset 6998 in orxonox.OLD for trunk

Timestamp:

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

Author:

bensch

Message:

trunk: more button definitions

Location:

trunk/src

Files:

• defs/globals.h (modified) (1 diff)
• lib/event/key_mapper.cc (modified) (4 diffs)
• lib/event/key_mapper.h (modified) (2 diffs)
• lib/gui/gtk_gui/gui_keys.cc (modified) (1 diff)
• world_entities/player.cc (modified) (2 diffs)
• world_entities/space_ships/hover.cc (modified) (2 diffs)

trunk/src/defs/globals.h

@@ -74 +74 @@
 #define   CONFIG_NAME_PLAYER_ROLL_RIGHT    "RollR"
 #define   CONFIG_NAME_PLAYER_ROLL_LEFT     "RollL"
+#define   CONFIG_NAME_PLAYER_UP            "Up"
+#define   CONFIG_NAME_PLAYER_DOWN          "Down"
 
 #define   CONFIG_NAME_PLAYER_FIRE          "Fire"
 #define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next"
 #define   CONFIG_NAME_PLAYER_PREV_WEAPON   "Prev"
+#define   CONFIG_NAME_PLAYER_CHANGE_SHIP   "Change_Ship"
+
 #define   CONFIG_NAME_QUIT                 "Quit"
 #define   CONFIG_NAME_PAUSE                "Pause"

trunk/src/lib/event/key_mapper.cc

@@ -37 +37 @@
 int KeyMapper::PEV_LEFT              = EV_UNKNOWN;
 int KeyMapper::PEV_RIGHT             = EV_UNKNOWN;
+int KeyMapper::PEV_UP                = EV_UNKNOWN;
+int KeyMapper::PEV_DOWN              = EV_UNKNOWN;
 int KeyMapper::PEV_ROLL_LEFT         = EV_UNKNOWN;
 int KeyMapper::PEV_ROLL_RIGHT        = EV_UNKNOWN;
@@ -46 +48 @@
 int KeyMapper::PEV_PREVIOUS_WEAPON   = EV_UNKNOWN;
 int KeyMapper::PEV_NEXT_WEAPON       = EV_UNKNOWN;
+
+int KeyMapper::PEV_CHANGE_SHIP       = EV_UNKNOWN;
 
 int KeyMapper::PEV_VIEW0             = EV_UNKNOWN;
@@ -67 +71 @@
  */
 orxKeyMapping map[] = {
-  {&KeyMapper::PEV_FORWARD,                   CONFIG_NAME_PLAYER_FORWARD},
-  {&KeyMapper::PEV_BACKWARD,                 CONFIG_NAME_PLAYER_BACKWARD},
+  {&KeyMapper::PEV_FORWARD,              CONFIG_NAME_PLAYER_FORWARD},
+  {&KeyMapper::PEV_BACKWARD,             CONFIG_NAME_PLAYER_BACKWARD},
+  {&KeyMapper::PEV_UP,                   CONFIG_NAME_PLAYER_UP},
+  {&KeyMapper::PEV_DOWN,                 CONFIG_NAME_PLAYER_DOWN},
   {&KeyMapper::PEV_LEFT,                 CONFIG_NAME_PLAYER_LEFT},
   {&KeyMapper::PEV_RIGHT,                CONFIG_NAME_PLAYER_RIGHT},
@@ -81 +87 @@
   {&KeyMapper::PEV_NEXT_WEAPON,          CONFIG_NAME_PLAYER_NEXT_WEAPON},
   {&KeyMapper::PEV_PREVIOUS_WEAPON,      CONFIG_NAME_PLAYER_PREV_WEAPON},
+
+  {&KeyMapper::PEV_CHANGE_SHIP,          CONFIG_NAME_PLAYER_CHANGE_SHIP},
 
 

trunk/src/lib/event/key_mapper.h

@@ -43 +43 @@
   static int PEV_LEFT;              //!< left button
   static int PEV_RIGHT;             //!< right button
+  static int PEV_UP;                //!< up button
+  static int PEV_DOWN;              //!< down button
 
   static int PEV_ROLL_LEFT;         //!< rolls left
@@ -54 +56 @@
   static int PEV_PREVIOUS_WEAPON;   //!< prev weapon button
   static int PEV_NEXT_WEAPON;       //!< next weapon button
+
+  static int PEV_CHANGE_SHIP;       //!< The button to change the Ship.
 
   static int PEV_VIEW0;             //!< view 0 button

trunk/src/lib/gui/gtk_gui/gui_keys.cc

@@ -119 +119 @@
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "a"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "d"));
+
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_UP, "r"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_DOWN, "f"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_ROLL_LEFT, "q"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_ROLL_RIGHT, "e"));
+
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "BUTTON_LEFT"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_PREV_WEAPON, "n"));
+        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_CHANGE_SHIP, "g"));
         closeButton = new Button("close");
 #ifdef HAVE_GTK2

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)