From ffcc633af3a316e0022abaef805234659d26f56b Mon Sep 17 00:00:00 2001 From: Hourier Date: Sat, 4 Jul 2020 19:31:34 +0900 Subject: [PATCH] [Refactor] #40467 Separated old-feature-types.h from load.c --- Hengband/Hengband/Hengband.vcxproj | 1 + Hengband/Hengband/Hengband.vcxproj.filters | 3 +++ src/Makefile.am | 6 ++++-- src/birth/auto-roller.c | 5 ----- src/savedata/load.c | 25 ++++++------------------- src/savedata/old-feature-types.h | 12 ++++++++++++ 6 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 src/savedata/old-feature-types.h diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj index 228794fea..ee68aae8b 100644 --- a/Hengband/Hengband/Hengband.vcxproj +++ b/Hengband/Hengband/Hengband.vcxproj @@ -694,6 +694,7 @@ + diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters index 1bfc1f781..0f32511a6 100644 --- a/Hengband/Hengband/Hengband.vcxproj.filters +++ b/Hengband/Hengband/Hengband.vcxproj.filters @@ -3499,6 +3499,9 @@ savedata + + savedata + diff --git a/src/Makefile.am b/src/Makefile.am index 85b7af9e5..a3f5ed4c6 100644 --- 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 b1f059a82..6c0d4e079 100644 --- 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 ad75ed977..e99869449 100644 --- 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 index 000000000..2ab002103 --- /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; -- 2.11.0