X-Git-Url: https://git.yukkurigames.com/?p=rogue-pphs.git;a=blobdiff_plain;f=command.c;h=52e7e62b8555d612d6f1deab5237a1ba57123ac2;hp=6b8033b1417ec8d9c68e9ac9f43c164e7ebd2ab2;hb=e4a106dfa01b6c98a80e32a2dcd2ec501adbf952;hpb=a868f7779583a00316cb076fc4d62ccfb1488434 diff --git a/command.c b/command.c index 6b8033b..52e7e62 100644 --- a/command.c +++ b/command.c @@ -101,26 +101,6 @@ command() count = 0; } } - switch (ch) - { - case 'f': - if (!on(player, ISBLIND)) - { - door_stop = TRUE; - firstmove = TRUE; - } - if (count && !newcount) - ch = direction; - else - ch = readchar(cw); - switch (ch) - { - case 'h': case 'j': case 'k': case 'l': - case 'y': case 'u': case 'b': case 'n': - ch = toupper(ch); - } - direction = ch; - } newcount = FALSE; /* * execute a command @@ -165,6 +145,18 @@ command() when 'R' : ring_off(); when 'o' : option(); when 'c' : call(); + when 'f': + if (!get_dir()) + after = FALSE; + else + flirt(delta.y, delta.x); + when 'g': + if (!get_dir()) + after = FALSE; + else + gift(delta.y, delta.x); + when 'E': + embrace(); when '>' : after = FALSE; d_level(); when '<' : after = FALSE; u_level(); when '?' : after = FALSE; help();