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

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

diff --git a/src/artifact.c b/src/artifact.c
index e0dcb16..c8cbb37 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "cmd-activate.h"
+#include "object-curse.h"
 
 static int suppression_evil_dam(object_type *o_ptr);
 static int weakening_artifact(object_type *o_ptr);
@@ -1677,7 +1678,7 @@ static void give_activation_power(object_type *o_ptr)
  */
 static void get_random_name(object_type *o_ptr, char *return_name, bool armour, int power)
 {
-       int prob = randint1(100);
+       PERCENTAGE prob = randint1(100);
 
        if (prob <= SINDARIN_NAME)
        {
@@ -1743,7 +1744,7 @@ static void get_random_name(object_type *o_ptr, char *return_name, bool armour,
 bool create_artifact(object_type *o_ptr, bool a_scroll)
 {
        char    new_name[1024];
-       int     has_pval = 0;
+       PARAMETER_VALUE has_pval = 0;
        int     powers = randint1(5) + 1;
        int     max_powers;
        int     max_type = (object_is_weapon_ammo(o_ptr) ? 7 : 5);
@@ -2069,7 +2070,6 @@ bool create_artifact(object_type *o_ptr, bool a_scroll)
        msg_format_wizard(CHEAT_OBJECT, _("パワー %d で 価値%ld のランダムアーティファクト生成 バイアスは「%s」",
                "Random artifact generated - Power:%d Value:%d Bias:%s."), max_powers, total_flags, artifact_bias_name[o_ptr->artifact_bias]);
 
-       /* Window stuff */
        p_ptr->window |= (PW_INVEN | PW_EQUIP);
 
        return TRUE;
@@ -2275,7 +2275,6 @@ bool create_named_art(ARTIFACT_IDX a_idx, POSITION y, POSITION x)
        /* Acquire the "kind" index */
        i = lookup_kind(a_ptr->tval, a_ptr->sval);
 
-       /* Oops */
        if (!i) return FALSE;
 
        /* Create the artifact */
@@ -2311,7 +2310,7 @@ bool create_named_art(ARTIFACT_IDX a_idx, POSITION y, POSITION x)
 /*対邪平均ダメージの計算処理*/
 int calc_arm_avgdamage(object_type *o_ptr)
 {
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
        object_flags(o_ptr, flgs);
 
        HIT_POINT dam, base, s_evil, forced, vorpal;
@@ -2352,7 +2351,7 @@ int calc_arm_avgdamage(object_type *o_ptr)
 static int suppression_evil_dam(object_type *o_ptr)
 {
        int num = FALSE;
-       u32b flgs[TR_FLAG_SIZE];
+       BIT_FLAGS flgs[TR_FLAG_SIZE];
        object_flags(o_ptr, flgs);
 
        if (have_flag(flgs, TR_VAMPIRIC))
@@ -2403,8 +2402,8 @@ static int weakening_artifact(object_type *o_ptr)
 
         if ((k_ptr->dd < o_ptr->dd) || (k_ptr->ds < o_ptr->ds))
         {
-               int pre_dd = o_ptr->dd;
-               int pre_ds = o_ptr->ds;
+               DICE_NUMBER pre_dd = o_ptr->dd;
+               DICE_SID pre_ds = o_ptr->ds;
 
                if (o_ptr->dd > o_ptr->ds)
                {
@@ -2423,7 +2422,7 @@ static int weakening_artifact(object_type *o_ptr)
        
        if (o_ptr->to_d > 10)
        {
-               int pre_damage = o_ptr->to_d;
+               HIT_POINT pre_damage = o_ptr->to_d;
 
                o_ptr->to_d = o_ptr->to_d - damroll(1, 6);
                if (o_ptr->to_d < 10)