nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

context sensitive item action for candles

Browse Source 
When picking candles from an inventory display, expand the 'a' choice
if carrying the Candelabrum of Invocation.
This commit is contained in:
PatR
2026-01-11 01:49:06 -08:00
parent 96394394b8
commit ac7f0d3615
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/invent.c
View File

@@ -3305,9 +3305,16 @@ itemactions(struct obj *otmp)
Sprintf(buf, "%s the candelabrum", light);
ia_addmenu(win, IA_APPLY_OBJ, 'a', buf);
} else if (otmp->otyp == WAX_CANDLE || otmp->otyp == TALLOW_CANDLE) {
Sprintf(buf, "%s %s %s", light,
is_plural(otmp) ? "these" : "this",
simpleonames(otmp));
boolean multiple = (otmp->quan == 1L) ? FALSE : TRUE;
const char *s = multiple ? "these" : "this";
struct obj *o = carrying(CANDELABRUM_OF_INVOCATION);
if (o && o->spe < 7)
Sprintf(buf, "Attach %s to your candelabrum, or %s %s", s,
!otmp->lamplit ? "light" : "extinguish", /* [lowercase] */
multiple ? "them" : "it");
else
Sprintf(buf, "%s %s %s", light, s, simpleonames(otmp));
ia_addmenu(win, IA_APPLY_OBJ, 'a', buf);
} else if (otmp->otyp == OIL_LAMP || otmp->otyp == MAGIC_LAMP
|| otmp->otyp == BRASS_LANTERN) {

2
src/pager.c
View File

@@ -1721,7 +1721,7 @@ do_look(int mode, coord *click_cc)
* introduced.
*
* When lootabc is set, abandon the 'y'|'n' compatibility in
* favor of newer '/' and '?' compatobility instead.
* favor of newer '/' and '?' compatibility instead.
*/
any.a_char = '/';