Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10638 in orxonox.OLD for trunk/src/lib


Ignore:
Timestamp:
Apr 19, 2007, 4:06:51 PM (18 years ago)
Author:
snellen
Message:

Merged inputdevice-branch back to trunk: New ScriptTrigger (ActionTrigger) available

Location:
trunk/src/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/event/key_mapper.cc

    r10618 r10638  
    4646int KeyMapper::PEV_STRAFE_RIGHT      = EV_UNKNOWN;
    4747int KeyMapper::PEV_JUMP              = EV_UNKNOWN;
     48int KeyMapper::PEV_ACTION            = EV_UNKNOWN;
    4849
    4950int KeyMapper::PEV_FIRE1             = EV_UNKNOWN;
    … …  
    8283      {&KeyMapper::PEV_ROLL_RIGHT,           CONFIG_NAME_PLAYER_ROLL_LEFT,       SDLK_z},
    8384      {&KeyMapper::PEV_ROLL_LEFT,            CONFIG_NAME_PLAYER_ROLL_RIGHT,      SDLK_c},
    84       {&KeyMapper::PEV_STRAFE_LEFT,          "StrafeLeft",                       SDLK_q},
    85       {&KeyMapper::PEV_STRAFE_RIGHT,         "StrafeRight",                      SDLK_e},
    86       {&KeyMapper::PEV_JUMP,                 "Jump",                             SDLK_SPACE},
     85      {&KeyMapper::PEV_STRAFE_LEFT,          CONFIG_NAME_PLAYER_STRAFE_LEFT,     SDLK_q},
     86      {&KeyMapper::PEV_STRAFE_RIGHT,         CONFIG_NAME_PLAYER_STRAFE_RIGHT,    SDLK_e},
     87      {&KeyMapper::PEV_JUMP,                 CONFIG_NAME_PLAYER_JUMP,            SDLK_SPACE},
     88      {&KeyMapper::PEV_ACTION,               CONFIG_NAME_PLAYER_ACTION,          SDLK_u},
    8789
    8890      {&KeyMapper::PEV_FIRE1,                CONFIG_NAME_PLAYER_FIRE,            EV_MOUSE_BUTTON_LEFT},
    89       {&KeyMapper::PEV_FIRE2,                "Fire2",                            EV_MOUSE_BUTTON_RIGHT},
     91      {&KeyMapper::PEV_FIRE2,                CONFIG_NAME_PLAYER_FIRE2,           EV_MOUSE_BUTTON_RIGHT},
    9092      {&KeyMapper::PEV_NEXT_WEAPON,          CONFIG_NAME_PLAYER_NEXT_WEAPON,     EV_MOUSE_BUTTON_WHEELUP},
    9193      {&KeyMapper::PEV_PREVIOUS_WEAPON,      CONFIG_NAME_PLAYER_PREV_WEAPON,     EV_MOUSE_BUTTON_WHEELDOWN},

  • trunk/src/lib/event/key_mapper.h

    r9869 r10638  
    5757
    5858  static int PEV_JUMP;              //!< jump
     59  static int PEV_ACTION;            //!< the action (or use) key
    5960
    6061  static int PEV_FIRE1;             //!< fire button 1

  • trunk/src/lib/script_engine/script.cc

    r10622 r10638  
    409409    this->registerClass("TickTrigger");
    410410    this->registerClass("TimeTrigger");
     411    this->registerClass("ActionTrigger");
     412
    411413
    412414   return success;
Note: See TracChangeset for help on using the changeset viewer.