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

Candelabrum now reads "(n of 7 candles attached)"

Browse Source 
It wasn't obvious enough before that the Candelabrum has seven candle
slots. This makes it show it clearly.
This commit is contained in:
Patric Mueller
2020-01-04 13:08:08 +01:00
parent 18b46449f0
commit 1acd631766
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes37.0
View File

@@ -78,6 +78,7 @@ NetHack Community Patches (or Variation) Included
hallucinatory trap names from github pull request #174
autounlock feature originally from unnethack in github pull request #228
applying a candelabrum with no candles gives a tip (github #265)
candelabrum now reads "(n of 7 candles attached)" (github #265)
Code Cleanup and Reorganization

6
src/objnam.c
View File

@@ -1096,11 +1096,7 @@ unsigned doname_flags;
break;
}
if (obj->otyp == CANDELABRUM_OF_INVOCATION) {
if (!obj->spe)
Strcpy(tmpbuf, "no");
else
Sprintf(tmpbuf, "%d", obj->spe);
Sprintf(eos(bp), " (%s candle%s%s)", tmpbuf, plur(obj->spe),
Sprintf(eos(bp), " (%d of 7 candle%s%s)", obj->spe, plur(obj->spe),
!obj->lamplit ? " attached" : ", lit");
break;
} else if (obj->otyp == OIL_LAMP || obj->otyp == MAGIC_LAMP