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

diff --git a/src/artifact.c b/src/artifact.c
index e0dcb16..bae071c 100644 (file)
--- a/src/artifact.c
+++ b/src/artifact.c
@@ -1677,7 +1677,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)
        {

diff --git a/src/externs.h b/src/externs.h
index 0fb17ed..08fee24 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -935,7 +935,7 @@ extern bool fire_bolt(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
 extern bool fire_blast(EFFECT_ID typ, DIRECTION dir, int dd, int ds, int num, int dev);
 extern void call_chaos(void);
 extern bool fire_beam(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
-extern bool fire_bolt_or_beam(int prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
+extern bool fire_bolt_or_beam(PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam);
 extern bool lite_line(DIRECTION dir, HIT_POINT dam);
 extern bool hypodynamic_bolt(DIRECTION dir, HIT_POINT dam);
 extern bool death_ray(DIRECTION dir, int plev);

diff --git a/src/mspells1.c b/src/mspells1.c
index fd9a85f..b54e917 100644 (file)
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -48,7 +48,7 @@
  * @param prob 基本確率(%)
  * @return 適した選択を取るならばTRUEを返す。
  */
-static bool int_outof(monster_race *r_ptr, int prob)
+static bool int_outof(monster_race *r_ptr, PERCENTAGE prob)
 {
        /* Non-Smart monsters are half as "smart" */
        if (!(r_ptr->flags2 & RF2_SMART)) prob = prob / 2;

diff --git a/src/object2.c b/src/object2.c
index aa41ff5..17fb62a 100644 (file)
--- a/src/object2.c
+++ b/src/object2.c
@@ -4846,7 +4846,8 @@ static bool kind_is_good(KIND_OBJECT_IDX k_idx)
  */
 bool make_object(object_type *j_ptr, BIT_FLAGS mode)
 {
-       int prob, base;
+       PERCENTAGE prob;
+       DEPTH base;
 
 
        /* Chance of "special object" */
@@ -5536,7 +5537,7 @@ typedef struct
 {
        OBJECT_TYPE_VALUE tval;
        OBJECT_SUBTYPE_VALUE sval;
-       int prob;
+       PERCENTAGE prob;
        byte flag;
 } amuse_type;
 

diff --git a/src/spells2.c b/src/spells2.c
index 80c822c..415a502 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -3079,10 +3079,10 @@ bool fire_blast(EFFECT_ID typ, DIRECTION dir, int dd, int ds, int num, int dev)
  */
 bool teleport_swap(DIRECTION dir)
 {
-       int tx, ty;
-       cave_type * c_ptr;
-       monster_type * m_ptr;
-       monster_race * r_ptr;
+       POSITION tx, ty;
+       cave_type* c_ptr;
+       monster_type* m_ptr;
+       monster_race* r_ptr;
 
        if ((dir == 5) && target_okay())
        {
@@ -3226,7 +3226,7 @@ bool fire_beam(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
  * Affect monsters, grids and objects.
  * </pre>
  */
-bool fire_bolt_or_beam(int prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
+bool fire_bolt_or_beam(PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam)
 {
        if (randint0(100) < prob)
        {

diff --git a/src/wizard2.c b/src/wizard2.c
index faf0763..25f07e6 100644 (file)
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -59,7 +59,7 @@ void do_cmd_rerate_aux(void)
  */
 void do_cmd_rerate(bool display)
 {
-       int percent;
+       PERCENTAGE percent;
 
        /* Rerate */
        do_cmd_rerate_aux();
@@ -259,7 +259,7 @@ static void prt_alloc(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval, TERM_PO
                int total_frac = 0;
                for (j = 0; j < alloc_kind_size; j++)
                {
-                       int prob = 0;
+                       PERCENTAGE prob = 0;
 
                        if (table[j].level <= i)
                        {