update year to 2023

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

diff --git a/src/trap.c b/src/trap.c
index dcef19b..223671e 100644 (file)
--- a/src/trap.c
+++ b/src/trap.c
@@ -5,7 +5,7 @@
 
 /* JNetHack Copyright */
 /* (c) Issei Numata, Naoki Hamada, Shigehiro Miyashita, 1994-2000  */
-/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2020            */
+/* For 3.4-, Copyright (c) SHIRAKATA Kentaro, 2002-2023            */
 /* JNetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
@@ -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)
@@ -6774,9 +6774,9 @@ unconscious()
 */
     return (boolean) (u.usleep
                       || (nomovemsg
-                          && (!strncmp(nomovemsg, "\96Ú\82ª\82³\82ß\82½\82ª\93ª\92É", 18)
-                              || !strncmp(nomovemsg, "\82 \82È\82½\82Í\90³\8bC\82Ã\82¢\82½", 18)
-                              || !strncmp(nomovemsg, "\82 \82È\82½\82Í\82Ü\82½\90³\8bC\82Ã", 18))));
+                          && (!STRNCMP2(nomovemsg, "\96Ú\82ª\82³\82ß\82½\82ª\93ª\92É")
+                              || !STRNCMP2(nomovemsg, "\82 \82È\82½\82Í\90³\8bC\82Ã\82¢\82½")
+                              || !STRNCMP2(nomovemsg, "\82 \82È\82½\82Í\82Ü\82½\90³\8bC\82Ã"))));
 #endif
 }
 
@@ -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) {