From f4aa6f90767d4052fb9bfd99cc12a80d3c109041 Mon Sep 17 00:00:00 2001 From: deskull Date: Fri, 26 Apr 2019 22:31:36 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20saved=5Ffloors=20=E3=82=92?= =?utf8?q?=20floor.c/h=E3=80=80=E3=81=B8=E7=A7=BB=E5=8B=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 1 - src/floor.c | 6 ++++++ src/floor.h | 3 ++- src/variable.c | 4 ---- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/externs.h b/src/externs.h index 2e36370aa..bd1be2659 100644 --- a/src/externs.h +++ b/src/externs.h @@ -224,7 +224,6 @@ extern byte angband_color_table[256][4]; extern const concptr angband_sound_name[SOUND_MAX]; extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX]; extern world_type *current_world_ptr; -extern saved_floor_type saved_floors[MAX_SAVED_FLOORS]; extern FLOOR_IDX max_floor_id; extern u32b saved_floor_file_sign; extern TOWN_IDX max_towns; diff --git a/src/floor.c b/src/floor.c index cd3b7d065..4256ae4e6 100644 --- a/src/floor.c +++ b/src/floor.c @@ -8,3 +8,9 @@ */ floor_type floor_info; floor_type *current_floor_ptr = &floor_info; + +/* + * The array of saved floors + */ +saved_floor_type saved_floors[MAX_SAVED_FLOORS]; + diff --git a/src/floor.h b/src/floor.h index aa31804a5..0515ebb8f 100644 --- a/src/floor.h +++ b/src/floor.h @@ -300,4 +300,5 @@ typedef struct { (have_flag((F)->flags, FF_WALL) && \ have_flag((F)->flags, FF_PERMANENT)) -extern floor_type *current_floor_ptr; \ No newline at end of file +extern floor_type *current_floor_ptr; +extern saved_floor_type saved_floors[MAX_SAVED_FLOORS]; \ No newline at end of file diff --git a/src/variable.c b/src/variable.c index efecdd9f6..2954e0652 100644 --- a/src/variable.c +++ b/src/variable.c @@ -429,10 +429,6 @@ const concptr angband_music_basic_name[MUSIC_BASIC_MAX] = "ambush", }; -/* - * The array of saved floors - */ -saved_floor_type saved_floors[MAX_SAVED_FLOORS]; /* * Number of floor_id used from birth -- 2.11.0