changeset 316:c03d0b87211c default tip

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.
author John "Elwin" Edwards
date Sun, 31 Oct 2021 21:35:53 -0400
parents ad2570b5b21f
children
files arogue5/command.c arogue7/command.c rogue3/command.c srogue/command.c urogue/command.c xrogue/command.c
diffstat 6 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/arogue5/command.c	Sun Oct 24 20:26:21 2021 -0400
+++ b/arogue5/command.c	Sun Oct 31 21:35:53 2021 -0400
@@ -222,8 +222,8 @@
 		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();
--- a/arogue7/command.c	Sun Oct 24 20:26:21 2021 -0400
+++ b/arogue7/command.c	Sun Oct 31 21:35:53 2021 -0400
@@ -285,9 +285,9 @@
 		    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();
--- a/rogue3/command.c	Sun Oct 24 20:26:21 2021 -0400
+++ b/rogue3/command.c	Sun Oct 31 21:35:53 2021 -0400
@@ -166,7 +166,7 @@
 		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();
--- a/srogue/command.c	Sun Oct 24 20:26:21 2021 -0400
+++ b/srogue/command.c	Sun Oct 31 21:35:53 2021 -0400
@@ -175,7 +175,7 @@
 				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();
--- a/urogue/command.c	Sun Oct 24 20:26:21 2021 -0400
+++ b/urogue/command.c	Sun Oct 31 21:35:53 2021 -0400
@@ -394,8 +394,8 @@
                 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;
 
                 /*
--- a/xrogue/command.c	Sun Oct 24 20:26:21 2021 -0400
+++ b/xrogue/command.c	Sun Oct 31 21:35:53 2021 -0400
@@ -320,7 +320,9 @@
                         }
                     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 @@
                     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') :