From d79b09a0345480907b83877141057d346b0d172e Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 12 Jan 2019 22:41:19 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E5=9E=8B=E3=81=AE?= =?utf8?q?=E7=BD=AE=E6=8F=9B=E3=80=82=20/=20Type=20replacement.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 2 +- src/floor-save.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/externs.h b/src/externs.h index 24b1890ee..9d41563c2 100644 --- a/src/externs.h +++ b/src/externs.h @@ -673,7 +673,7 @@ extern void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode); extern void init_saved_floors(bool force); extern void clear_saved_floor_files(void); extern saved_floor_type *get_sf_ptr(FLOOR_IDX floor_id); -extern s16b get_new_floor_id(void); +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 void leave_floor(void); diff --git a/src/floor-save.c b/src/floor-save.c index a28e32645..90ce4b98d 100644 --- a/src/floor-save.c +++ b/src/floor-save.c @@ -15,7 +15,7 @@ #include "grid.h" -static s16b new_floor_id; /*!<次のフロアのID / floor_id of the destination */ +static FLOOR_IDX new_floor_id; /*!<次のフロアのID / floor_id of the destination */ static u32b change_floor_mode; /*!<フロア移行処理に関するフラグ / Mode flags for changing floor */ static u32b latest_visit_mark; /*!<フロアを渡った回数？(確認中) / Max number of visit_mark */ @@ -229,10 +229,10 @@ static void kill_saved_floor(saved_floor_type *sf_ptr) * @details * If number of saved floors are already MAX_SAVED_FLOORS, kill the oldest one. */ -s16b get_new_floor_id(void) +FLOOR_IDX get_new_floor_id(void) { saved_floor_type *sf_ptr = NULL; - s16b i; + FLOOR_IDX i; /* Look for empty space */ for (i = 0; i < MAX_SAVED_FLOORS; i++) @@ -868,7 +868,6 @@ void leave_floor(void) p_ptr->floor_id = get_new_floor_id(); } - /* Search the quest monster index */ for (i = 0; i < max_q_idx; i++) { -- 2.11.0