From 8a4bf3766797192db3ff4f11a2d48c08f8ea7a8b Mon Sep 17 00:00:00 2001 From: "John \"Elwin\" Edwards" Date: Sun, 31 Oct 2021 21:35:53 -0400 Subject: [PATCH] Naming items should not use up a turn. This was fixed by adding "after = FALSE;" to the relevant cases in command(). Rogue V4 and V5 are not affected. --- arogue5/command.c | 4 ++-- arogue7/command.c | 4 ++-- rogue3/command.c | 2 +- srogue/command.c | 2 +- urogue/command.c | 4 ++-- xrogue/command.c | 6 ++++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/arogue5/command.c b/arogue5/command.c index d73c33b..fb427a6 100644 --- a/arogue5/command.c +++ b/arogue5/command.c @@ -222,8 +222,8 @@ command(void) when 'W' : wear(); when 'T' : take_off(); when 'o' : option(); - when 'c' : call(FALSE); - when 'm' : call(TRUE); + when 'c' : after = FALSE; call(FALSE); + when 'm' : after = FALSE; call(TRUE); when '>' : after = FALSE; d_level(); when '<' : after = FALSE; u_level(); when '?' : after = FALSE; help(); diff --git a/arogue7/command.c b/arogue7/command.c index 0e9a1b8..ac4f23f 100644 --- a/arogue7/command.c +++ b/arogue7/command.c @@ -285,9 +285,9 @@ command(void) when C_WEAR : wear(); when C_TAKEOFF : take_off(); when 'o' : option(); - when CTRL('N') : nameit(); + when CTRL('N') : after = FALSE; nameit(); when '=' : after = FALSE; display(); - when 'm' : nameitem(NULL, TRUE); + when 'm' : after = FALSE; nameitem(NULL, TRUE); when '>' : after = FALSE; d_level(); when '<' : after = FALSE; u_level(); when '?' : after = FALSE; help(); diff --git a/rogue3/command.c b/rogue3/command.c index 7c36ab4..aec618d 100644 --- a/rogue3/command.c +++ b/rogue3/command.c @@ -166,7 +166,7 @@ command() when 'P' : ring_on(); when 'R' : ring_off(); when 'o' : option(); - when 'c' : call(); + when 'c' : after = FALSE; call(); when '>' : after = FALSE; d_level(); when '<' : after = FALSE; u_level(); when '?' : after = FALSE; help(); diff --git a/srogue/command.c b/srogue/command.c index 4d0dbc6..5b4973f 100644 --- a/srogue/command.c +++ b/srogue/command.c @@ -175,7 +175,7 @@ command(void) when 'P' : ring_on(); when 'R' : ring_off(); when 'O' : option(); - when 'c' : call(); + when 'c' : after = FALSE; call(); when '>' : after = FALSE; d_level(); when '<' : after = FALSE; u_level(); when '?' : after = FALSE; help(); diff --git a/urogue/command.c b/urogue/command.c index fbcc0b0..cc97122 100644 --- a/urogue/command.c +++ b/urogue/command.c @@ -394,8 +394,8 @@ command(void) case 'P': ring_on(); break; case 'R': ring_off(); break; case 'p': prayer(); break; - case 'C': call(FALSE); break; - case 'M': call(TRUE); break; + case 'C': after = FALSE; call(FALSE); break; + case 'M': after = FALSE; call(TRUE); break; case 's': search(FALSE); break; /* diff --git a/xrogue/command.c b/xrogue/command.c index 6c54793..d3818b3 100644 --- a/xrogue/command.c +++ b/xrogue/command.c @@ -320,7 +320,9 @@ command(void) } when 'i' : after = FALSE; inventory(pack, ALL); when 'I' : after = FALSE; picky_inven(); - when 'm' : nameitem((struct linked_list *)NULL, TRUE); + when 'm' : + after = FALSE; + nameitem((struct linked_list *)NULL, TRUE); when 'o' : option(); when 'O' : msg("Charactor type: %s Quest item: %s", char_class[char_type].name, rel_magic[quest_item].mi_name); when ',' : @@ -398,7 +400,7 @@ command(void) food_left); when CTRL('L') : after = FALSE; clearok(curscr, TRUE); touchwin(cw); - when CTRL('N') : nameit(); + when CTRL('N') : after = FALSE; nameit(); when CTRL('O') : after = FALSE; opt_player(); when CTRL('R') : after = FALSE; msg(huh); when CTRL('T') :