[Refactor] #37353 型の置換。 / Type replacement.

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

diff --git a/src/wizard1.c b/src/wizard1.c
index 04b8d95..f0ca3bd 100644 (file)
--- a/src/wizard1.c
+++ b/src/wizard1.c
@@ -80,7 +80,6 @@ static cptr attr_to_text(monster_race *r_ptr)
 #endif
        }
 
-       /* Oops */
 #ifdef JP000
        return "変な";
 #else
@@ -95,7 +94,7 @@ static cptr attr_to_text(monster_race *r_ptr)
  */
 typedef struct
 {
-       byte tval;
+       OBJECT_TYPE_VALUE tval;
        cptr name;
 } grouper;
 
@@ -234,7 +233,7 @@ static grouper group_item[] =
  * @param k ベースアイテムID
  * @return なし
  */
-static void kind_info(char *buf, char *dam, char *wgt, char *chance, int *lev, s32b *val, int k)
+static void kind_info(char *buf, char *dam, char *wgt, char *chance, DEPTH *lev, PRICE *val, OBJECT_IDX k)
 {
        object_type forge;
        object_type *q_ptr;
@@ -325,14 +324,15 @@ static void kind_info(char *buf, char *dam, char *wgt, char *chance, int *lev, s
                char chance_aux[20] = "";
                if(k_info[q_ptr->k_idx].chance[i] > 0)
                {
-                       sprintf(chance_aux, "%s%3dF:%+4d", (i != 0 ? "/" : ""), k_info[q_ptr->k_idx].locale[i], 100/k_info[q_ptr->k_idx].chance[i]);
+                       sprintf(chance_aux, "%s%3dF:%+4d", (i != 0 ? "/" : ""),
+                               (int)k_info[q_ptr->k_idx].locale[i], 100/k_info[q_ptr->k_idx].chance[i]);
                        strcat(chance, chance_aux);
                }
        }
 
 
        /* Weight */
-       sprintf(wgt, "%3d.%d", q_ptr->weight / 10, q_ptr->weight % 10);
+       sprintf(wgt, "%3d.%d", (int)(q_ptr->weight / 10), (int)(q_ptr->weight % 10));
 }
 
 
@@ -346,7 +346,7 @@ static void spoil_obj_desc(cptr fname)
 {
        int i, k, s, t, n = 0, group_start = 0;
 
-       u16b who[200];
+       OBJECT_IDX who[200];
 
        char buf[1024];
 
@@ -364,7 +364,6 @@ static void spoil_obj_desc(cptr fname)
        /* Open the file */
        fff = my_fopen(buf, "w");
 
-       /* Oops */
        if (!fff)
        {
                msg_print("Cannot create spoiler file.");
@@ -398,11 +397,11 @@ static void spoil_obj_desc(cptr fname)
                                                int i1 = t;
                                                int i2 = t + 1;
 
-                                               int e1;
-                                               int e2;
+                                               DEPTH e1;
+                                               DEPTH e2;
 
-                                               s32b t1;
-                                               s32b t2;
+                                               PRICE t1;
+                                               PRICE t2;
 
                                                kind_info(NULL, NULL, NULL, NULL, &e1, &t1, who[i1]);
                                                kind_info(NULL, NULL, NULL, NULL, &e2, &t2, who[i2]);
@@ -421,15 +420,15 @@ static void spoil_obj_desc(cptr fname)
                                /* Spoil each item */
                                for (s = 0; s < n; s++)
                                {
-                                       int e;
-                                       s32b v;
+                                       DEPTH e;
+                                       PRICE v;
 
                                        /* Describe the kind */
                                        kind_info(buf, dam, wgt, chance, &e, &v, who[s]);
 
                                        /* Dump it */
                                        fprintf(fff, "  %-35s%8s%7s%5d %-40s%9ld\n",
-                                               buf, dam, wgt, e, chance, (long)(v));
+                                               buf, dam, wgt, (int)e, chance, (long)(v));
                                }
 
                                /* Start a new set */
@@ -467,7 +466,6 @@ static void spoil_obj_desc(cptr fname)
                return;
        }
 
-       /* Message */
        msg_print("Successfully created a spoiler file.");
 }
 
@@ -1031,7 +1029,7 @@ static void spoiler_underline(cptr str)
  * The possibly updated description pointer is returned.
  * </pre>
  */
-static cptr *spoiler_flag_aux(const u32b art_flags[TR_FLAG_SIZE],
+static cptr *spoiler_flag_aux(const BIT_FLAGS art_flags[TR_FLAG_SIZE],
                              const flag_desc *flag_ptr,
                              cptr *desc_ptr, const int n_elmnts)
 {
@@ -1073,7 +1071,7 @@ static void analyze_general(object_type *o_ptr, char *desc_ptr)
  */
 static void analyze_pval(object_type *o_ptr, pval_info_type *pi_ptr)
 {
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        cptr *affects_list;
 
@@ -1129,7 +1127,7 @@ static void analyze_pval(object_type *o_ptr, pval_info_type *pi_ptr)
  */
 static void analyze_slay(object_type *o_ptr, cptr *slay_list)
 {
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        object_flags(o_ptr, flgs);
 
@@ -1150,7 +1148,7 @@ static void analyze_slay(object_type *o_ptr, cptr *slay_list)
  */
 static void analyze_brand(object_type *o_ptr, cptr *brand_list)
 {
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        object_flags(o_ptr, flgs);
 
@@ -1171,7 +1169,7 @@ static void analyze_brand(object_type *o_ptr, cptr *brand_list)
  */
 static void analyze_resist(object_type *o_ptr, cptr *resist_list)
 {
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        object_flags(o_ptr, flgs);
 
@@ -1192,7 +1190,7 @@ static void analyze_resist(object_type *o_ptr, cptr *resist_list)
  */
 static void analyze_immune(object_type *o_ptr, cptr *immune_list)
 {
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        object_flags(o_ptr, flgs);
 
@@ -1213,7 +1211,7 @@ static void analyze_immune(object_type *o_ptr, cptr *immune_list)
  */
 static void analyze_sustains(object_type *o_ptr, cptr *sustain_list)
 {
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
 
        object_flags(o_ptr, flgs);
 
@@ -1250,8 +1248,8 @@ static void analyze_sustains(object_type *o_ptr, cptr *sustain_list)
  */
 static void analyze_misc_magic(object_type *o_ptr, cptr *misc_list)
 {
-       u32b flgs[TR_FLAG_SIZE];
-       int rad;
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
+       POSITION rad;
        char desc[256];
 
        object_flags(o_ptr, flgs);
@@ -1277,12 +1275,12 @@ static void analyze_misc_magic(object_type *o_ptr, cptr *misc_list)
 
        if (have_flag(flgs, TR_LITE_FUEL))
        {
-               if(rad > 0) sprintf(desc, _("それは燃料補給によって明かり(半径 %d)を授ける。", "It provides light (radius %d) when fueled."), rad);        
+               if(rad > 0) sprintf(desc, _("それは燃料補給によって明かり(半径 %d)を授ける。", "It provides light (radius %d) when fueled."), (int)rad);   
        }
        else
        {
-               if(rad > 0) sprintf(desc, _("永久光源(半径 %d)", "Permanent Light(radius %d)"), rad);     
-               if(rad < 0) sprintf(desc, _("永久光源(半径-%d)。", "Permanent Light(radius -%d)"), -rad);
+               if(rad > 0) sprintf(desc, _("永久光源(半径 %d)", "Permanent Light(radius %d)"), (int)rad);        
+               if(rad < 0) sprintf(desc, _("永久光源(半径-%d)。", "Permanent Light(radius -%d)"), (int)-rad);
        }
 
        if(rad != 0) *misc_list++ = quark_str(quark_add(desc));
@@ -1383,13 +1381,11 @@ static void analyze_misc(object_type *o_ptr, char *misc_desc)
 {
        artifact_type *a_ptr = &a_info[o_ptr->name1];
 
+       sprintf(misc_desc, _("レベル %d, 希少度 %u, %d.%d kg, ＄%ld", "Level %d, Rarity %u, %d.%d lbs, %ld Gold"),
+               (int)a_ptr->level, a_ptr->rarity,
 #ifdef JP
-       sprintf(misc_desc, "レベル %u, 希少度 %u, %d.%d kg, ＄%ld",
-               a_ptr->level, a_ptr->rarity,
                lbtokg1(a_ptr->weight), lbtokg2(a_ptr->weight), (long int)a_ptr->cost);
 #else
-       sprintf(misc_desc, "Level %u, Rarity %u, %d.%d lbs, %ld Gold",
-               a_ptr->level, a_ptr->rarity,
                a_ptr->weight / 10, a_ptr->weight % 10, a_ptr->cost);
 #endif
 }
@@ -1581,7 +1577,6 @@ static void spoiler_outlist(cptr header, cptr *list, char separator)
 static void spoiler_print_art(obj_desc_list *art_ptr)
 {
        pval_info_type *pval_ptr = &art_ptr->pval_info;
-
        char buf[80];
 
        /* Don't indent the first line */
@@ -1596,20 +1591,11 @@ static void spoiler_print_art(obj_desc_list *art_ptr)
        }
 
        /* Now deal with the description lists */
-
-#ifdef JP
-       spoiler_outlist("対:", art_ptr->slays, ITEM_SEP);
-       spoiler_outlist("武器属性:", art_ptr->brands, LIST_SEP);
-       spoiler_outlist("免疫:", art_ptr->immunities, ITEM_SEP);
-       spoiler_outlist("耐性:", art_ptr->resistances, ITEM_SEP);
-       spoiler_outlist("維持:", art_ptr->sustains, ITEM_SEP);
-#else
-       spoiler_outlist("Slay", art_ptr->slays, ITEM_SEP);
-       spoiler_outlist("", art_ptr->brands, LIST_SEP);
-       spoiler_outlist("Immunity to", art_ptr->immunities, ITEM_SEP);
-       spoiler_outlist("Resist", art_ptr->resistances, ITEM_SEP);
-       spoiler_outlist("Sustain", art_ptr->sustains, ITEM_SEP);
-#endif
+       spoiler_outlist(_("対:", "Slay"), art_ptr->slays, ITEM_SEP);
+       spoiler_outlist(_("武器属性:", ""), art_ptr->brands, LIST_SEP);
+       spoiler_outlist(_("免疫:", "Immunity to"), art_ptr->immunities, ITEM_SEP);
+       spoiler_outlist(_("耐性:", "Resist"), art_ptr->resistances, ITEM_SEP);
+       spoiler_outlist(_("維持:", "Sustain"), art_ptr->sustains, ITEM_SEP);
        spoiler_outlist("", art_ptr->misc_magic, LIST_SEP);
 
        if (art_ptr->addition[0])
@@ -1635,20 +1621,17 @@ static void spoiler_print_art(obj_desc_list *art_ptr)
  * @param name1 生成するアーティファクトID
  * @return 生成が成功した場合TRUEを返す
  */
-static bool make_fake_artifact(object_type *o_ptr, int name1)
+static bool make_fake_artifact(object_type *o_ptr, IDX name1)
 {
-       int i;
-
+       IDX i;
        artifact_type *a_ptr = &a_info[name1];
 
-
        /* Ignore "empty" artifacts */
        if (!a_ptr->name) return FALSE;
 
        /* Acquire the "kind" index */
        i = lookup_kind(a_ptr->tval, a_ptr->sval);
 
-       /* Oops */
        if (!i) return (FALSE);
 
        /* Create the artifact */
@@ -1680,16 +1663,14 @@ static bool make_fake_artifact(object_type *o_ptr, int name1)
  */
 static void spoil_artifact(cptr fname)
 {
-       int i, j;
+       int i;
+       IDX j;
 
        object_type forge;
        object_type *q_ptr;
-
        obj_desc_list artifact;
-
        char buf[1024];
 
-
        /* Build the filename */
        path_build(buf, sizeof(buf), ANGBAND_DIR_USER, fname);
 
@@ -1699,7 +1680,6 @@ static void spoil_artifact(cptr fname)
        /* Open the file */
        fff = my_fopen(buf, "w");
 
-       /* Oops */
        if (!fff)
        {
                msg_print("Cannot create spoiler file.");
@@ -1730,8 +1710,6 @@ static void spoil_artifact(cptr fname)
 
                        /* Get local object */
                        q_ptr = &forge;
-
-                       /* Wipe the object */
                        object_wipe(q_ptr);
 
                        /* Attempt to "forge" the artifact */
@@ -1752,7 +1730,6 @@ static void spoil_artifact(cptr fname)
                return;
        }
 
-       /* Message */
        msg_print("Successfully created a spoiler file.");
 }
 
@@ -1789,7 +1766,6 @@ static void spoil_mon_desc(cptr fname)
        /* Open the file */
        fff = my_fopen(buf, "w");
 
-       /* Oops */
        if (!fff)
        {
                msg_print("Cannot create spoiler file.");
@@ -1837,9 +1813,9 @@ static void spoil_mon_desc(cptr fname)
 
                /* Get the "name" */
                /*
-               else if (r_ptr->flags1 & (RF1_QUESTOR))
+               else if (r_ptr->flags3 & (RF3_NO_CONF))
                {
-                       sprintf(nam, "[Q] %s", name);
+                       sprintf(nam, "[*] %s", name);
                }
                */
                else if (r_ptr->flags1 & (RF1_UNIQUE))
@@ -2116,7 +2092,7 @@ static void spoil_mon_info(cptr fname)
 {
        char buf[1024];
        int i, l, n = 0;
-       u32b flags1;
+       BIT_FLAGS flags1;
 
        u16b why = 2;
        s16b *who;
@@ -2130,7 +2106,6 @@ static void spoil_mon_info(cptr fname)
        /* Open the file */
        fff = my_fopen(buf, "w");
 
-       /* Oops */
        if (!fff)
        {
                msg_print("Cannot create spoiler file.");
@@ -2216,7 +2191,7 @@ static void spoil_mon_info(cptr fname)
                spoil_out(buf);
 
                /* Level */
-               sprintf(buf, "Lev:%d  ", r_ptr->level);
+               sprintf(buf, "Lev:%d  ", (int)r_ptr->level);
                spoil_out(buf);
 
                /* Rarity */
@@ -2409,7 +2384,6 @@ static void spoil_mon_evol(cptr fname)
        /* Open the file */
        fff = my_fopen(buf, "w");
 
-       /* Oops */
        if (!fff)
        {
                msg_print("Cannot create spoiler file.");
@@ -2518,7 +2492,6 @@ static void spoil_mon_evol(cptr fname)
                return;
        }
 
-       /* Message */
        msg_print("Successfully created a spoiler file.");
 }
 
@@ -2592,7 +2565,6 @@ void do_cmd_spoilers(void)
                        spoil_mon_evol("mon-evol.txt");
                        break;
 
-               /* Oops */
                default:
                        bell();
                        break;
@@ -2735,7 +2707,6 @@ void spoil_random_artifact(cptr fname)
        /* Open the file */
        fff = my_fopen(buf, "w");
 
-       /* Oops */
        if (!fff)
        {
                msg_print("Cannot create list file.");
@@ -2787,7 +2758,6 @@ void spoil_random_artifact(cptr fname)
                return;
        }
 
-       /* Message */
        msg_print("Successfully created a list file.");
 }