From: Patric Mueller <bhaak@gmx.net>
Date: Sat, 4 Jan 2020 12:08:08 +0000 (+0100)
Subject: Candelabrum now reads "(n of 7 candles attached)"
X-Git-Tag: NetHack-3.7.0_WIP~89^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1acd6317663a3c66d525ab1698351bf1c076bacf;p=nethack

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

It wasn't obvious enough before that the Candelabrum has seven candle
slots. This makes it show it clearly.
---

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index bab5ec03b..2fd6b1503 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -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
diff --git a/src/objnam.c b/src/objnam.c
index 50f64ebb7..6da47e52d 100644
--- a/src/objnam.c
+++ b/src/objnam.c
@@ -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