overhaul hcolor()/jconj_adj()

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

diff --git a/src/pray.c b/src/pray.c
index 06d097b..f2af86f 100644 (file)
--- a/src/pray.c
+++ b/src/pray.c
@@ -568,7 +568,7 @@ int trouble;
 #else
             Your("%s\82Í%s\82â\82í\82ç\82©\82­\8bP\82¢\82½\81D",
                  what ? what : (const char *)xname(otmp),
-                 jconj_adj(hcolor(NH_AMBER)));
+                 hcolor_adv(NH_AMBER));
 #endif
             iflags.last_msg = PLNMSG_OBJ_GLOWS;
             otmp->bknown = !Hallucination; /* ok to skip set_bknown() */
@@ -657,7 +657,7 @@ int trouble;
 /*JP
             pline("%s %s.", Yobjnam2(otmp, "softly glow"), hcolor(NH_AMBER));
 */
-            pline("%s\82Í%s\82â\82í\82ç\82©\82­\8bP\82¢\82½\81D", y_monnam(u.usteed), hcolor(NH_AMBER));
+            pline("%s\82Í%s\82â\82í\82ç\82©\82­\8bP\82¢\82½\81D", y_monnam(u.usteed), hcolor_adv(NH_AMBER));
             set_bknown(otmp, 1);
         }
         uncurse(otmp);
@@ -1274,7 +1274,7 @@ aligntyp g_align;
                               hcolor(NH_AMBER), repair_buf);
 #else
                         Your("%s\82Í%s\82â\82í\82ç\82©\82­\8bP\82¢\82½\81D%s", xname(uwep), 
-                             jconj_adj(hcolor(NH_AMBER)), repair_buf);
+                              hcolor_adv(NH_AMBER), repair_buf);
 #endif
                         iflags.last_msg = PLNMSG_OBJ_GLOWS;
                     } else
@@ -1431,7 +1431,7 @@ aligntyp g_align;
                               hcolor(NH_AMBER));
 #else
                         Your("%s\82Í%s\82â\82í\82ç\82©\82­\8bP\82¢\82½\81D", xname(otmp),
-                             jconj_adj(hcolor(NH_AMBER)));
+                              hcolor_adv(NH_AMBER));
 #endif
                         iflags.last_msg = PLNMSG_OBJ_GLOWS;
                         otmp->bknown = 1; /* ok to bypass set_bknown() */
@@ -1581,7 +1581,7 @@ boolean bless_water;
         pline("%s\8dÕ\92d\82Ì\96ò\82Í\88ê\8fu%s\8bP\82¢\82½\81D",
               (other && changed > 1L) ? "\82¢\82­\82Â\82©\82Ì"
                                       : "",
-              jconj_adj(bless_water ? hcolor(NH_LIGHT_BLUE) : hcolor(NH_BLACK)));
+              (bless_water ? hcolor_adv(NH_LIGHT_BLUE) : hcolor_adv(NH_BLACK)));
 #endif
     }
     return (boolean) (changed > 0L);
@@ -2179,11 +2179,11 @@ dosacrifice()
                                                : (const char *) "gray"));
 #else
                         pline("\8dÕ\92d\82Í%s\8bP\82¢\82½\81D",
-                              jconj_adj(hcolor((u.ualign.type == A_LAWFUL)
+                                  hcolor_adv((u.ualign.type == A_LAWFUL)
                                             ? NH_WHITE
                                             : u.ualign.type
                                                ? NH_BLACK
-                                               : (const char *)"\8aD\90F\82Ì")));
+                                               : (const char *)"\8aD\90F\82Ì"));
 #endif
 
                     if (rnl(u.ulevel) > 6 && u.ualign.record > 0