overhaul hcolor()/jconj_adj()

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

diff --git a/src/do.c b/src/do.c
index e662015..4a07b43 100644 (file)
--- a/src/do.c
+++ b/src/do.c
@@ -383,7 +383,7 @@ register struct obj *obj;
 #else
         pline("%s\82ª\8dÕ\92d\82É\90G\82ê\82é\82Æ%s\8cõ\82Á\82½\81D",
               doname(obj),
-              jconj_adj(hcolor(obj->blessed ? NH_AMBER : NH_BLACK)));
+              hcolor_adv(obj->blessed ? NH_AMBER : NH_BLACK));
 #endif
         if (!Hallucination)
             obj->bknown = 1; /* ok to bypass set_bknown() */
@@ -728,14 +728,14 @@ register struct obj *obj;
                       hcolor((obj->spe < 0) ? NH_BLACK : NH_SILVER));
 #else
             pline("\97¬\82µ\91ä\82Í\88ê\8fu%s\8bP\82¢\82½\81D",
-                      jconj_adj(hcolor((obj->spe < 0) ? NH_BLACK : NH_SILVER)));
+                      hcolor_adv((obj->spe < 0) ? NH_BLACK : NH_SILVER));
 #endif
             break;
         case RIN_WARNING:
 /*JP
             pline_The("sink glows %s for a moment.", hcolor(NH_WHITE));
 */
-            pline("\97¬\82µ\91ä\82Í\88ê\8fu%s\8bP\82¢\82½\81D", jconj_adj(hcolor(NH_WHITE)));
+            pline("\97¬\82µ\91ä\82Í\88ê\8fu%s\8bP\82¢\82½\81D", hcolor_adv(NH_WHITE));
             break;
         case RIN_TELEPORT_CONTROL:
 /*JP: "beam aboard" \82Í\83X\83^\81[\83g\83\8c\83b\83N\82Ì\81u\93]\91\97\81v*/