RF1_FRIENDは使われていない(RF1_FRIENDSしか生成には関与していない)ので廃止。

diff --git a/lib/edit/r_info_j.txt b/lib/edit/r_info_j.txt
index f46b957..f908b61 100644 (file)
--- a/lib/edit/r_info_j.txt
+++ b/lib/edit/r_info_j.txt
@@ -2272,7 +2272,7 @@ G:u:U
 I:110:9d9:20:32:30
 W:8:2:0:19:0:0
 B:BITE:DISEASE:1d9
-F:FRIENDS | FRIEND |
+F:FRIENDS |
 F:OPEN_DOOR | BASH_DOOR | IM_POIS |
 F:EVIL | DEMON | IM_FIRE | NO_FEAR
 D:$It is a minor demon servitor of Nurgle. It looks like a hairless 
@@ -3892,7 +3892,7 @@ W:13:3:0:65:700:877
 B:CLAW:HURT:1d4
 B:CLAW:HURT:1d4
 B:BITE:POISON:1d8
-F:ANIMAL | EVIL | FRIEND | FRIENDS | CAN_FLY | FORCE_MAXHP |
+F:ANIMAL | EVIL | FRIENDS | CAN_FLY | FORCE_MAXHP |
 F:IM_COLD | IM_ELEC | IM_POIS | WEIRD_MIND | DROP_CORPSE | EAT_POISONOUS
 D:$Devil-bats, notoriously difficult to kill.
 D:°­Ëâ¤Îéþéõ¤Ç¡¢Åݤ¹¤Î¤¬º¤Æñ¤Ê¤³¤È¤Ç°­Ì¾¹â¤¤¡£
@@ -17733,7 +17733,7 @@ B:BITE:PARALYZE:5d5
 B:BITE:PARALYZE:5d5
 B:BITE:POISON:7d5
 B:BITE:LOSE_ALL:8d5
-F:FRIEND | FRIENDS | 
+F:FRIENDS | 
 F:COLD_BLOOD | EMPTY_MIND | REGENERATE | BASH_DOOR | KILL_BODY | KILL_ITEM | 
 F:ANIMAL | HURT_LITE | IM_ACID | IM_ELEC | IM_FIRE | IM_COLD | IM_POIS | 
 F:RES_TELE | RES_NETH | RES_DISE | 

diff --git a/src/defines.h b/src/defines.h
index ae07320..5cc2b95 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -3105,7 +3105,7 @@
 #define RF1_FORCE_MAXHP         0x00000200  /* Start with max hitpoints */
 #define RF1_FORCE_SLEEP         0x00000400  /* Start out sleeping */
 #define RF1_FORCE_EXTRA         0x00000800  /* Start out something */
-#define RF1_FRIEND              0x00001000  /* Arrive with a friend */
+#define RF1_XXX1                0x00001000  /* XXX */
 #define RF1_FRIENDS             0x00002000  /* Arrive with some friends */
 #define RF1_ESCORT              0x00004000  /* Arrive with an escort */
 #define RF1_ESCORTS             0x00008000  /* Arrive with some escorts */
@@ -3123,8 +3123,8 @@
 #define RF1_DROP_4D2            0x08000000  /* Drop 4d2 items/gold */
 #define RF1_DROP_GOOD           0x10000000  /* Drop good items */
 #define RF1_DROP_GREAT          0x20000000  /* Drop great items */
-#define RF1_XXX1                0x40000000  /* XXX */
-#define RF1_XXX2                0x80000000  /* XXX */
+#define RF1_XXX2                0x40000000  /* XXX */
+#define RF1_XXX3                0x80000000  /* XXX */
 
 /*
  * New monster race bit flags

diff --git a/src/init1.c b/src/init1.c
index e962829..c5812a0 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -150,7 +150,7 @@ static cptr r_info_flags1[] =
        "FORCE_MAXHP",
        "FORCE_SLEEP",
        "FORCE_EXTRA",
-       "FRIEND",
+       "XXX1",
        "FRIENDS",
        "ESCORT",
        "ESCORTS",
@@ -168,8 +168,8 @@ static cptr r_info_flags1[] =
        "DROP_4D2",
        "DROP_GOOD",
        "DROP_GREAT",
-       "XXX1",
-       "XXX2"
+       "XXX2",
+       "XXX3"
 };
 
 /*

diff --git a/src/monster1.c b/src/monster1.c
index fc1902d..5197e60 100644 (file)
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -229,7 +229,6 @@ static void roff_aux(int r_idx, int remem)
        if (r_ptr->flags1 & RF1_FEMALE)  flags1 |= (RF1_FEMALE);
 
        /* Assume some "creation" flags */
-       if (r_ptr->flags1 & RF1_FRIEND)  flags1 |= (RF1_FRIEND);
        if (r_ptr->flags1 & RF1_FRIENDS) flags1 |= (RF1_FRIENDS);
        if (r_ptr->flags1 & RF1_ESCORT)  flags1 |= (RF1_ESCORT);
        if (r_ptr->flags1 & RF1_ESCORTS) flags1 |= (RF1_ESCORTS);
@@ -935,7 +934,7 @@ roff(format("%^s
        }
 
        /* Describe friends */
-       else if ((flags1 & RF1_FRIEND) || (flags1 & RF1_FRIENDS))
+       else if (flags1 & RF1_FRIENDS)
        {
 #ifdef JP
                roff(format("%^s¤ÏÄ̾ｸÃĤǸ½¤ì¤ë¡£",

diff --git a/src/wizard1.c b/src/wizard1.c
index fc7cc16..ecd94c6 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -2240,7 +2240,7 @@ spoil_out("
                        else spoil_out("an escort.  ");
                }
 
-               if ((flags1 & RF1_FRIEND) || (flags1 & RF1_FRIENDS))
+               if (flags1 & RF1_FRIENDS)
                {
                        sprintf(buf, "%s usually appears in groups.  ", wd_che[msex]);
                        spoil_out(buf);