diff options
| author | Simon Howard | 2009-06-05 16:58:48 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-06-05 16:58:48 +0000 |
| commit | e3e71290f86c785a29ec6b9eeb609c7625776255 (patch) | |
| tree | 81f1836604fd90202bc68dd5ade35baf3e50696e /src/g_game.c | |
| parent | b30d83c55a749994d95ebe4d7320db6db3bd43da (diff) | |
| download | chocolate-doom-e3e71290f86c785a29ec6b9eeb609c7625776255.tar.gz chocolate-doom-e3e71290f86c785a29ec6b9eeb609c7625776255.tar.bz2 chocolate-doom-e3e71290f86c785a29ec6b9eeb609c7625776255.zip | |
Add key binding variables for automap and weapon keys.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 1551
Diffstat (limited to 'src/g_game.c')
| -rw-r--r-- | src/g_game.c | 33 |
1 files changed, 29 insertions, 4 deletions
diff --git a/src/g_game.c b/src/g_game.c index 44e77a74..cd070884 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -173,6 +173,15 @@ int key_fire = KEY_RCTRL; int key_use = ' '; int key_strafe = KEY_RALT; int key_speed = KEY_RSHIFT; + +int key_weapon1 = '1'; +int key_weapon2 = '2'; +int key_weapon3 = '3'; +int key_weapon4 = '4'; +int key_weapon5 = '5'; +int key_weapon6 = '6'; +int key_weapon7 = '7'; +int key_weapon8 = '8'; int mousebfire = 0; int mousebstrafe = 1; @@ -211,6 +220,17 @@ fixed_t forwardmove[2] = {0x19, 0x32}; fixed_t sidemove[2] = {0x18, 0x28}; fixed_t angleturn[3] = {640, 1280, 320}; // + slow turn +static int *weapon_keys[] = { + &key_weapon1, + &key_weapon2, + &key_weapon3, + &key_weapon4, + &key_weapon5, + &key_weapon6, + &key_weapon7, + &key_weapon8 +}; + #define SLOWTURNTICS 6 #define NUMKEYS 256 @@ -501,13 +521,18 @@ void G_BuildTiccmd (ticcmd_t* cmd) } // chainsaw overrides - for (i=0 ; i<NUMWEAPONS-1 ; i++) - if (gamekeydown['1'+i]) - { + + for (i=0; i<arrlen(weapon_keys); ++i) + { + int key = *weapon_keys[i]; + + if (gamekeydown[key]) + { cmd->buttons |= BT_CHANGE; cmd->buttons |= i<<BT_WEAPONSHIFT; break; - } + } + } // mouse if (mousebuttons[mousebforward]) |