overhaul hcolor()/jconj_adj()

[jnethack/source.git] / src / trap.c

diff --git a/src/trap.c b/src/trap.c
index dcef19b..c3bb07f 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -6445,7 +6445,7 @@ boolean disarm;
 #else
             pline("%s\83K\83X\89_\82ª%s\82Ì\92ê\82Å\89Q\82Ü\82¢\82½\81D",
                   Blind ? blindgas[rn2(SIZE(blindgas))] :
-                  jconj_adj(rndcolor()), xname(obj));
+                  rndcolor(), xname(obj));
 #endif
             if (!Stunned) {
                 if (Hallucination)
@@ -6870,7 +6870,7 @@ lava_effects()
                           The(xname(obj)), hcolor("dark red"));
 #else
                     pline("%s\82Í\95s\8ev\8bc\82É%s\8bP\82¢\82½\82ª\81C\96³\8f\9d\82Ì\82æ\82¤\82¾\81D",
-                          xname(obj), jconj_adj(hcolor("\88Ã\90Ô\90F\82Ì")));
+                          xname(obj), hcolor_adv("\88Ã\90Ô\90F\82Ì"));
 #endif
             } else if (obj->in_use) {
                 if (obj->owornmask) {