Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5969 in orxonox.OLD for branches/spaceshipcontrol


Ignore:
Timestamp:
Dec 7, 2005, 4:26:02 PM (19 years ago)
Author:
bensch
Message:

controll: new key definitions

Location:
branches/spaceshipcontrol/src
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/spaceshipcontrol/src/defs/globals.h

    r5819 r5969  
    6868#define   CONFIG_NAME_PLAYER_LEFT          "Left"
    6969#define   CONFIG_NAME_PLAYER_RIGHT         "Right"
     70#define   CONFIG_NAME_PLAYER_ROLL_RIGHT    "RollR"
     71#define   CONFIG_NAME_PLAYER_ROLL_LEFT     "RollL"
     72
    7073#define   CONFIG_NAME_PLAYER_FIRE          "Fire"
    7174#define   CONFIG_NAME_PLAYER_NEXT_WEAPON   "Next"
  • branches/spaceshipcontrol/src/lib/event/key_mapper.cc

    r5886 r5969  
    3737int KeyMapper::PEV_LEFT              = EV_UNKNOWN;
    3838int KeyMapper::PEV_RIGHT             = EV_UNKNOWN;
     39int KeyMapper::PEV_ROLL_LEFT         = EV_UNKNOWN;
     40int KeyMapper::PEV_ROLL_RIGHT        = EV_UNKNOWN;
    3941int KeyMapper::PEV_STRAFE_LEFT       = EV_UNKNOWN;
    4042int KeyMapper::PEV_STRAFE_RIGHT      = EV_UNKNOWN;
     
    6971  {&KeyMapper::PEV_LEFT,                 CONFIG_NAME_PLAYER_LEFT},
    7072  {&KeyMapper::PEV_RIGHT,                CONFIG_NAME_PLAYER_RIGHT},
     73  {&KeyMapper::PEV_ROLL_LEFT,            CONFIG_NAME_PLAYER_ROLL_RIGHT},
     74  {&KeyMapper::PEV_ROLL_RIGHT,           CONFIG_NAME_PLAYER_ROLL_LEFT},
    7175  {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft"},
    7276  {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight"},
  • branches/spaceshipcontrol/src/lib/event/key_mapper.h

    r5886 r5969  
    4444  static int PEV_RIGHT;             //!< right button
    4545
     46  static int PEV_ROLL_LEFT;         //!< rolls left
     47  static int PEV_ROLL_RIGHT;        //!< rolls right
     48
    4649  static int PEV_STRAFE_LEFT;       //!< strafe left button
    4750  static int PEV_STRAFE_RIGHT;      //!< strafe right button
  • branches/spaceshipcontrol/src/lib/gui/gtk_gui/gui_keys.cc

    r5766 r5969  
    115115
    116116        pKeysBox->setGroupName(player);
    117         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_UP, "UP"));
    118         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_DOWN, "DOWN"));
    119         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "LEFT"));
    120         pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "RIGHT"));
     117        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_UP, "w"));
     118        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_DOWN, "s"));
     119        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_LEFT, "a"));
     120        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_RIGHT, "d"));
     121        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_ROLL_LEFT, "q"));
     122        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_ROLL_RIGHT, "e"));
    121123        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_FIRE, "MOUSE_LEFT"));
    122124        pKeysBox->fill(addKey(CONFIG_NAME_PLAYER_NEXT_WEAPON, "m"));
  • branches/spaceshipcontrol/src/lib/sound/sound_engine.cc

    r5910 r5969  
    281281
    282282  // INITIALIZING THE DEVICE:
    283 #ifndef AL_VERSION_1_1
     283#ifdef AL_VERSION_1_1
    284284  ALubyte deviceName[] =
    285285#else
Note: See TracChangeset for help on using the changeset viewer.