[Refactor] #37353 cmd1～melee1間整理。 / Refactor between cmd1 and melee1.

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

diff --git a/src/init1.c b/src/init1.c
index 9ddb029..2e2353e 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -365,7 +365,7 @@ static cptr r_info_flags3[] =
        "HURT_ROCK",
        "HURT_FIRE",
        "HURT_COLD",
-       "XXX",
+       "ANGEL",
        "XXX",
        "XXX",
        "XXX",
@@ -503,6 +503,7 @@ static cptr r_a_ability_flags2[] =
        "S_UNIQUE"
 };
 
+#if 0
 /*!
  * モンスター特性トークン(発動型能力3) /
  * Monster race flags
@@ -542,7 +543,9 @@ static cptr r_a_ability_flags3[] =
        "XXXA3X30",
        "XXXA3X31",
 };
+#endif
 
+#if 0
 /*!
  * モンスター特性トークン(発動型能力4) /
  * Monster race flags
@@ -582,6 +585,7 @@ static cptr r_a_ability_flags4[] =
        "XXXA4X30",
        "XXXA4X31",
 };
+#endif
 
 
 /*!
@@ -1821,7 +1825,7 @@ errr parse_f_info(char *buf, header *head)
                        if (1 == sscanf(s, "SUBTYPE_%d", &i))
                        {
                                /* Extract a "subtype" */
-                               f_ptr->subtype =  i;
+                               f_ptr->subtype = (FEAT_SUBTYPE)i;
 
                                /* Start at next entry */
                                s = t;
@@ -1860,7 +1864,7 @@ errr parse_f_info(char *buf, header *head)
                if (1 != sscanf(buf+2, "%d", &priority)) return (PARSE_ERROR_GENERIC);
 
                /* Save the value */
-               f_ptr->priority = priority;
+               f_ptr->priority = (FEAT_PRIORITY)priority;
        }
 
        /* Process 'K' for "States" (up to four lines + default (which cannot be last)) */
@@ -3497,7 +3501,7 @@ errr parse_d_info(char *buf, header *head)
                        if (1 == sscanf(s, "MONSTER_DIV_%d", &monst))
                        {
                                /* Extract a "Special %" */
-                               d_ptr->special_div = monst;
+                               d_ptr->special_div = (PROB)monst;
 
                                /* Start at next entry */
                                s = t;
@@ -3619,14 +3623,14 @@ typedef struct dungeon_grid dungeon_grid;
 
 struct dungeon_grid
 {
-       IDX             feature;                /* Terrain feature */
-       IDX             monster;                /* Monster */
-       IDX             object;                 /* Object */
-       IDX             ego;                    /* Ego-Item */
-       IDX             artifact;               /* Artifact */
-       IDX             trap;                   /* Trap */
-       int             cave_info;              /* Flags for CAVE_MARK, CAVE_GLOW, CAVE_ICKY, CAVE_ROOM */
-       int             special;                /* Reserved for special terrain info */
+       FEAT_IDX feature;               /* Terrain feature */
+       MONSTER_IDX     monster;                /* Monster */
+       OBJECT_IDX object;                      /* Object */
+       EGO_IDX ego;                    /* Ego-Item */
+       ARTIFACT_IDX artifact;          /* Artifact */
+       IDX trap;                       /* Trap */
+       BIT_FLAGS cave_info;            /* Flags for CAVE_MARK, CAVE_GLOW, CAVE_ICKY, CAVE_ROOM */
+       s16b special; /* Reserved for special terrain info */
        int             random;                 /* Number of the random effect */
 };
 
@@ -3864,10 +3868,10 @@ static errr parse_line_building(char *buf)
                                building[index].letters[action_index] = zz[4][0];
 
                                /* Action code */
-                               building[index].actions[action_index] = atoi(zz[5]);
+                               building[index].actions[action_index] = (BACT_IDX)atoi(zz[5]);
 
                                /* Action restriction */
-                               building[index].action_restr[action_index] = atoi(zz[6]);
+                               building[index].action_restr[action_index] = (BACT_RESTRICT_IDX)atoi(zz[6]);
 
                                break;
                        }
@@ -4387,7 +4391,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in
                        /* Maximum quests */
                        else if (zz[0][0] == 'Q')
                        {
-                               max_quests = (IDX)atoi(zz[1]);
+                               max_q_idx = (IDX)atoi(zz[1]);
                        }
 
                        /* Maximum r_idx */