diff options
| author | Simon Howard | 2009-06-10 19:49:29 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-06-10 19:49:29 +0000 |
| commit | d1f24077aae2c1258b26688bc67c89c566645576 (patch) | |
| tree | f18d8ee7ccdb8015dc513560b119b19a13a2c116 /src/hexen/g_game.c | |
| parent | 1dc0e81d95f1057ebf8d42f9932f7e1ba9b46136 (diff) | |
| download | chocolate-doom-d1f24077aae2c1258b26688bc67c89c566645576.tar.gz chocolate-doom-d1f24077aae2c1258b26688bc67c89c566645576.tar.bz2 chocolate-doom-d1f24077aae2c1258b26688bc67c89c566645576.zip | |
Make Hexen weapon and map keys reconfigurable.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1587
Diffstat (limited to 'src/hexen/g_game.c')
| -rw-r--r-- | src/hexen/g_game.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c index 9684eb17..190fdf76 100644 --- a/src/hexen/g_game.c +++ b/src/hexen/g_game.c @@ -135,6 +135,14 @@ fixed_t sidemove[NUMCLASSES][2] = { fixed_t angleturn[3] = { 640, 1280, 320 }; // + slow turn +static int *weapon_keys[] = +{ + &key_weapon1, + &key_weapon2, + &key_weapon3, + &key_weapon4, +}; + #define SLOWTURNTICS 6 #define NUMKEYS 256 @@ -446,13 +454,15 @@ void G_BuildTiccmd(ticcmd_t * cmd) dclicks = 0; // clear double clicks if hit use button } - for (i = 0; i < NUMWEAPONS; i++) + for (i=0; i<arrlen(weapon_keys); ++i) { - if (gamekeydown['1' + i]) + int key = *weapon_keys[i]; + + if (gamekeydown[key]) { - cmd->buttons |= BT_CHANGE; - cmd->buttons |= i << BT_WEAPONSHIFT; - break; + cmd->buttons |= BT_CHANGE; + cmd->buttons |= i<<BT_WEAPONSHIFT; + break; } } |