diff options
author | Simon Howard | 2014-03-13 10:20:39 -0400 |
---|---|---|
committer | Simon Howard | 2014-03-13 10:20:39 -0400 |
commit | 7e118463ae5ef0752ab0ae509eecfe409b82bdc3 (patch) | |
tree | b0ff4ab6bc4ecd4399f134dc25b4a5b8c51b69ce /src/hexen | |
parent | ecf457ddcbf481b451f37474b057a06e7d843b66 (diff) | |
parent | ae2c47344237e341a979adba4b2a20b68e4de559 (diff) | |
download | chocolate-doom-7e118463ae5ef0752ab0ae509eecfe409b82bdc3.tar.gz chocolate-doom-7e118463ae5ef0752ab0ae509eecfe409b82bdc3.tar.bz2 chocolate-doom-7e118463ae5ef0752ab0ae509eecfe409b82bdc3.zip |
Merge pull request #356 from fabiangreffrath/keybind-hexen
Allow to rebind artifact keys in Hexen.
Diffstat (limited to 'src/hexen')
-rw-r--r-- | src/hexen/g_game.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c index a448134b..9c20afe0 100644 --- a/src/hexen/g_game.c +++ b/src/hexen/g_game.c @@ -396,46 +396,46 @@ void G_BuildTiccmd(ticcmd_t *cmd, int maketic) } // Artifact hot keys - if (gamekeydown[KEY_BACKSPACE] && !cmd->arti) + if (gamekeydown[key_arti_all] && !cmd->arti) { - gamekeydown[KEY_BACKSPACE] = false; // Use one of each artifact + gamekeydown[key_arti_all] = false; // Use one of each artifact cmd->arti = NUMARTIFACTS; } - else if (gamekeydown['\\'] && !cmd->arti + else if (gamekeydown[key_arti_health] && !cmd->arti && (players[consoleplayer].mo->health < MAXHEALTH)) { - gamekeydown['\\'] = false; + gamekeydown[key_arti_health] = false; cmd->arti = arti_health; } - else if (gamekeydown['0'] && !cmd->arti) + else if (gamekeydown[key_arti_poisonbag] && !cmd->arti) { - gamekeydown['0'] = false; + gamekeydown[key_arti_poisonbag] = false; cmd->arti = arti_poisonbag; } - else if (gamekeydown['9'] && !cmd->arti) + else if (gamekeydown[key_arti_blastradius] && !cmd->arti) { - gamekeydown['9'] = false; + gamekeydown[key_arti_blastradius] = false; cmd->arti = arti_blastradius; } - else if (gamekeydown['8'] && !cmd->arti) + else if (gamekeydown[key_arti_teleport] && !cmd->arti) { - gamekeydown['8'] = false; + gamekeydown[key_arti_teleport] = false; cmd->arti = arti_teleport; } - else if (gamekeydown['7'] && !cmd->arti) + else if (gamekeydown[key_arti_teleportother] && !cmd->arti) { - gamekeydown['7'] = false; + gamekeydown[key_arti_teleportother] = false; cmd->arti = arti_teleportother; } - else if (gamekeydown['6'] && !cmd->arti) + else if (gamekeydown[key_arti_egg] && !cmd->arti) { - gamekeydown['6'] = false; + gamekeydown[key_arti_egg] = false; cmd->arti = arti_egg; } - else if (gamekeydown['5'] && !cmd->arti + else if (gamekeydown[key_arti_invulnerability] && !cmd->arti && !players[consoleplayer].powers[pw_invulnerability]) { - gamekeydown['5'] = false; + gamekeydown[key_arti_invulnerability] = false; cmd->arti = arti_invulnerability; } |