[Refactor] #40467 Separated old-feature-types.h from load.c

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 228794f..ee68aae 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -694,6 +694,7 @@
     <ClInclude Include="..\..\src\object-hook\hook-quest.h" />\r
     <ClInclude Include="..\..\src\object-hook\hook-weapon.h" />\r
     <ClInclude Include="..\..\src\object-potion\quaff-execution.h" />\r
+    <ClInclude Include="..\..\src\savedata\old-feature-types.h" />\r
     <ClInclude Include="..\..\src\specific-object\death-crimson.h" />\r
     <ClInclude Include="..\..\src\spell-kind\blood-curse.h" />\r
     <ClInclude Include="..\..\src\spell-kind\spells-enchant.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index 1bfc1f7..0f32511 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -3499,6 +3499,9 @@
     <ClInclude Include="..\..\src\savedata\load.h">
       <Filter>savedata</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\savedata\old-feature-types.h">
+      <Filter>savedata</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 85b7af9..a3f5ed4 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -228,12 +228,10 @@ hengband_SOURCES = \
        io/input-key-processor.c io/input-key-processor.h \
        io/input-key-requester.c io/input-key-requester.h \
        io/interpret-pref-file.c io/interpret-pref-file.h \
-       io/load.c io/load.h \
        io/mutations-dump.c io/mutations-dump.h \
        io/pref-file-expressor.c io/pref-file-expressor.h \
        io/read-pref-file.c io/read-pref-file.h \
        io/report.c io/report.h \
-       io/save.c io/save.h \
        io/screen-util.c io/screen-util.h \
        io/signal-handlers.c io/signal-handlers.h \
        io/targeting.c io/targeting.h \
@@ -521,6 +519,10 @@ hengband_SOURCES = \
        room/rooms-pit-nest.c room/rooms-pit-nest.h \
        room/pit-nest-kinds-table.c room/pit-nest-kinds-table.h \
        \
+       savedata/old-feature-types.h \
+       savedata/load.c savedata/load.h \
+       savedata/save.c savedata/save.h \
+       \
        specific-object/bow.c specific-object/bow.h \
        specific-object/chest.c specific-object/chest.h \
        specific-object/death-crimson.c specific-object/death-crimson.h \

diff --git a/src/birth/auto-roller.c b/src/birth/auto-roller.c
index b1f059a..6c0d4e0 100644 (file)
--- a/src/birth/auto-roller.c
+++ b/src/birth/auto-roller.c
@@ -12,11 +12,6 @@
 #include "term/term-color-types.h"
 #include "util/int-char-converter.h"
 
-/*!
- * ランダムクエストのモンスターを確定するために試行する回数 / Maximum number of tries for selection of a proper quest monster
- */
-#define MAX_TRIES 100
-
 /*! オートローラの能力値的要求水準 / Autoroll limit */
 s16b stat_limit[6];
 

diff --git a/src/savedata/load.c b/src/savedata/load.c
index ad75ed9..e998694 100644 (file)
--- a/src/savedata/load.c
+++ b/src/savedata/load.c
@@ -1,5 +1,4 @@
 /*!
- * @file load.c
  * @brief セーブファイル読み込み処理 / Purpose: support for loading savefiles -BEN-
  * @date 2014/07/07
  * @author
@@ -75,6 +74,7 @@
 #include "player/player-skill.h"
 #include "player/race-info-table.h"
 #include "player/special-defense-types.h"
+#include "savedata/old-feature-types.h"
 #include "savedata/save.h"
 #include "spell/spells-status.h"
 #include "store/store-util.h"
@@ -92,24 +92,8 @@
 #include "world/world-object.h"
 #include "world/world.h"
 
-/*
- * Maximum number of tries for selection of a proper quest monster
- */
-#define MAX_TRIES 100
-
-#define OLD_MAX_MANE 22
-
 /* Old hidden trap flag */
-#define CAVE_TRAP 0x8000
-
-/*** Terrain Feature Indexes (see "lib/edit/f_info.txt") ***/
-#define OLD_FEAT_INVIS 0x02
-#define OLD_FEAT_GLYPH 0x03
-#define OLD_FEAT_QUEST_ENTER 0x08
-#define OLD_FEAT_QUEST_EXIT 0x09
-#define OLD_FEAT_MINOR_GLYPH 0x40
-#define OLD_FEAT_BLDG_1 0x81
-#define OLD_FEAT_MIRROR 0xc3
+static const BIT_FLAGS CAVE_TRAP = 0x8000;
 
 /* Old quests */
 #define OLD_QUEST_WATER_CAVE 18
@@ -1781,6 +1765,7 @@ static void rd_extra(player_type *creature_ptr)
         creature_ptr->mane_num = 0;
     } else if (z_older_than(10, 2, 3)) {
         s16b tmp16s;
+        const int OLD_MAX_MANE = 22;
         for (int i = 0; i < OLD_MAX_MANE; i++) {
             rd_s16b(&tmp16s);
             rd_s16b(&tmp16s);
@@ -2923,9 +2908,11 @@ static errr rd_savefile_new_aux(player_type *creature_ptr)
     if (arg_fiddle)
         note(_("メッセージをロードしました", "Loaded Messages"));
 
+        /* ランダムクエストのモンスターを確定するために試行する回数 / Maximum number of tries for selection of a proper quest monster */
+    const int MAX_TRIES = 100;
     for (int i = 0; i < max_r_idx; i++) {
         monster_race *r_ptr = &r_info[i];
-        r_ptr->max_num = 100;
+        r_ptr->max_num = MAX_TRIES;
 
         if (r_ptr->flags1 & RF1_UNIQUE)
             r_ptr->max_num = 1;

diff --git a/src/savedata/old-feature-types.h b/src/savedata/old-feature-types.h
new file mode 100644 (file)
index 0000000..2ab0021
--- /dev/null
+++ b/src/savedata/old-feature-types.h
@@ -0,0 +1,12 @@
+#pragma once
+
+/*** Terrain Feature Indexes (see "lib/edit/f_info.txt") ***/
+typedef enum old_feature_type {
+       OLD_FEAT_INVIS = 0x02,
+       OLD_FEAT_GLYPH = 0x03,
+       OLD_FEAT_QUEST_ENTER = 0x08,
+       OLD_FEAT_QUEST_EXIT = 0x09,
+       OLD_FEAT_MINOR_GLYPH = 0x40,
+       OLD_FEAT_BLDG_1 = 0x81,
+       OLD_FEAT_MIRROR = 0xc3,
+} old_feature_type;