[Refactor] #define MONSTER_HORDE による分岐処理削除 / Delete #define branch by MONSTER_HORDE.

[hengband/hengband.git] / src / flavor.c

diff --git a/src/flavor.c b/src/flavor.c
index 4aff4dc..d606075 100644 (file)
--- a/src/flavor.c
+++ b/src/flavor.c
@@ -65,7 +65,6 @@ static bool object_easy_know(int i)
                }
        }
 
-       /* Nope */
        return (FALSE);
 }
 
@@ -199,7 +198,7 @@ void get_table_sindarin(char *out_string)
  * @return なし
  * @details 巻物、各種魔道具などに利用される。
  */
-static void shuffle_flavors(byte tval)
+static void shuffle_flavors(OBJECT_TYPE_VALUE tval)
 {
        IDX *k_idx_list;
        IDX k_idx_list_num = 0;
@@ -966,7 +965,7 @@ static flag_insc_table flag_insc_sust[] =
  * sprintf(t, "%+d", n), and return a pointer to the terminator.
  * Note that we always print a sign, either "+" or "-".
  */
-static char *inscribe_flags_aux(flag_insc_table *fi_ptr, u32b flgs[TR_FLAG_SIZE], bool kanji, char *ptr)
+static char *inscribe_flags_aux(flag_insc_table *fi_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE], bool kanji, char *ptr)
 {
 #ifndef JP
        (void)kanji;
@@ -994,7 +993,7 @@ static char *inscribe_flags_aux(flag_insc_table *fi_ptr, u32b flgs[TR_FLAG_SIZE]
  * @param flgs 対応するオブジェクトのフラグ文字列
  * @return 1つでも該当の特性があったらTRUEを返す。
  */
-static bool have_flag_of(flag_insc_table *fi_ptr, u32b flgs[TR_FLAG_SIZE])
+static bool have_flag_of(flag_insc_table *fi_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE])
 {
        while (fi_ptr->english)
        {
@@ -1018,7 +1017,7 @@ static bool have_flag_of(flag_insc_table *fi_ptr, u32b flgs[TR_FLAG_SIZE])
 static char *get_ability_abbreviation(char *ptr, object_type *o_ptr, bool kanji, bool all)
 {
        char *prev_ptr = ptr;
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        /* Extract the flags */
        object_flags(o_ptr, flgs);
@@ -1249,7 +1248,7 @@ bool object_is_quest_target(object_type *o_ptr)
 {
        if (p_ptr->inside_quest)
        {
-               int a_idx = quest[p_ptr->inside_quest].k_idx;
+               ARTIFACT_IDX a_idx = quest[p_ptr->inside_quest].k_idx;
                if (a_idx)
                {
                        artifact_type *a_ptr = &a_info[a_idx];
@@ -1348,7 +1347,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode)
        char            tmp_val2[MAX_NLEN+10];
        char            fake_insc_buf[30];
 
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        object_type *bow_ptr;
 
@@ -2101,7 +2100,7 @@ void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode)
                        {
                                char k = t[-1];
 
-                               /* XXX XXX XXX Mega-Hack */
+                               /* Mega-Hack */
 
                                /* Hack -- "Cutlass-es" and "Torch-es" */
                                if ((k == 's') || (k == 'h')) *t++ = 'e';