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

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

diff --git a/src/init1.c b/src/init1.c
index c69fb59..c98898f 100644 (file)
--- a/src/init1.c
+++ b/src/init1.c
@@ -47,6 +47,7 @@
  */
 
 #include "angband.h"
+#include "trap.h"
 
 
 
@@ -188,15 +189,15 @@ static cptr f_info_flags[] =
        "LAVA",
        "SHALLOW",
        "DEEP",
-       "FILLED",
+       "POISON_PUDDLE",
        "HURT_ROCK",
        "HURT_FIRE",
        "HURT_COLD",
        "HURT_ACID",
-       "ICE",
-       "ACID",
+       "COLD_PUDDLE",
+       "ACID_PUDDLE",
        "OIL",
-       "XXX04",
+       "ELEC_PUDDLE",
        "CAN_CLIMB",
        "CAN_FLY",
        "CAN_SWIM",
@@ -365,7 +366,7 @@ static cptr r_info_flags3[] =
        "HURT_ROCK",
        "HURT_FIRE",
        "HURT_COLD",
-       "XXX",
+       "ANGEL",
        "XXX",
        "XXX",
        "XXX",
@@ -503,6 +504,7 @@ static cptr r_a_ability_flags2[] =
        "S_UNIQUE"
 };
 
+#if 0
 /*!
  * モンスター特性トークン(発動型能力3) /
  * Monster race flags
@@ -542,7 +544,9 @@ static cptr r_a_ability_flags3[] =
        "XXXA3X30",
        "XXXA3X31",
 };
+#endif
 
+#if 0
 /*!
  * モンスター特性トークン(発動型能力4) /
  * Monster race flags
@@ -582,6 +586,7 @@ static cptr r_a_ability_flags4[] =
        "XXXA4X30",
        "XXXA4X31",
 };
+#endif
 
 
 /*!
@@ -4387,7 +4392,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 */
@@ -4803,15 +4808,10 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
 errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax)
 {
        FILE *fp;
-
        char buf[1024];
-
        int num = -1;
-
        errr err = 0;
-
        bool bypass = FALSE;
-
        int x = xmin, y = ymin;