From 0a459f41b01be87b48f8a6ae7662192170f789dc Mon Sep 17 00:00:00 2001 From: deskull Date: Sun, 12 May 2019 10:39:26 +0900 Subject: [PATCH 1/1] =?utf8?q?[Refactor]=20#37353=E3=80=80max=5Ffloor=5Fid?= =?utf8?q?=20=E3=82=92=20floor-save.c/h=20=E3=81=B8=E7=A7=BB=E5=8B=95?= =?utf8?q?=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 1 - src/floor-save.c | 4 ++++ src/floor-save.h | 1 + src/variable.c | 5 ----- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/externs.h b/src/externs.h index b5a063ecb..330d5bc31 100644 --- a/src/externs.h +++ b/src/externs.h @@ -102,7 +102,6 @@ extern concptr *quark__str; extern term *angband_term[8]; -extern FLOOR_IDX max_floor_id; extern u32b saved_floor_file_sign; extern concptr keymap_act[KEYMAP_MODES][256]; extern player_type *p_ptr; diff --git a/src/floor-save.c b/src/floor-save.c index d4d8a4a5c..2dd4e2f2f 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -39,6 +39,10 @@ static FLOOR_IDX new_floor_id; /*!<次のフロアのID / floor_id of the desti static u32b change_floor_mode; /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */ static u32b latest_visit_mark; /*!<フロアを渡った回数?(確認中) / Max number of visit_mark */ +/* + * Number of floor_id used from birth + */ +FLOOR_IDX max_floor_id; /*! * @brief 保存フロア配列を初期化する / Initialize saved_floors array. diff --git a/src/floor-save.h b/src/floor-save.h index 99a7b05af..7de0bdfdc 100644 --- a/src/floor-save.h +++ b/src/floor-save.h @@ -22,3 +22,4 @@ extern saved_floor_type *get_sf_ptr(FLOOR_IDX floor_id); extern FLOOR_IDX get_new_floor_id(void); extern void prepare_change_floor_mode(BIT_FLAGS mode); extern void precalc_cur_num_of_pet(void); +extern FLOOR_IDX max_floor_id; \ No newline at end of file diff --git a/src/variable.c b/src/variable.c index b6d754681..7ea8b714c 100644 --- a/src/variable.c +++ b/src/variable.c @@ -137,11 +137,6 @@ concptr *quark__str; term *angband_term[8]; /* - * Number of floor_id used from birth - */ -FLOOR_IDX max_floor_id; - -/* * Sign for current process used in temporal files. * Actually it is the start time of current process. */ -- 2.11.0