From 404488b85e3ecf445e4bd97c77f6d36e1c9d7553 Mon Sep 17 00:00:00 2001 From: deskull Date: Mon, 6 May 2019 19:08:09 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20Windows=E7=89=88=E3=82=AA?= =?utf8?q?=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=95=E3=83=A9=E3=82=B0?= =?utf8?q?=20use=5F*=20=E3=82=92=20gameoption.c/h=20=E3=81=B8=E7=A7=BB?= =?utf8?q?=E5=8B=95=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/externs.h | 5 +---- src/gameoption.c | 6 ++++++ src/gameoption.h | 5 +++++ src/variable.c | 5 ----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/externs.h b/src/externs.h index d1c8e64ac..d156370fb 100644 --- a/src/externs.h +++ b/src/externs.h @@ -124,10 +124,7 @@ extern bool msg_flag; extern s16b running; extern GAME_TURN old_battle; -extern bool use_sound; -extern bool use_music; -extern bool use_graphics; -extern bool use_bigtile; + extern s16b signal_count; extern bool inkey_base; extern bool inkey_xtra; diff --git a/src/gameoption.c b/src/gameoption.c index 773219e35..1f7852baa 100644 --- a/src/gameoption.c +++ b/src/gameoption.c @@ -188,6 +188,12 @@ bool autosave_l; /* Autosave before entering new levels */ bool autosave_t; /* Timed autosave */ s16b autosave_freq; /* Autosave frequency */ +bool use_sound; /* The "sound" mode is enabled */ +bool use_music; /* The "music" mode is enabled */ +bool use_graphics; /* The "graphics" mode is enabled */ +bool use_bigtile = FALSE; + + /*! * @brief オプションテーブル / diff --git a/src/gameoption.h b/src/gameoption.h index 0d0f1aace..69f0d647f 100644 --- a/src/gameoption.h +++ b/src/gameoption.h @@ -184,6 +184,11 @@ extern s16b autosave_freq; extern bool autosave_t; extern bool autosave_l; +extern bool use_sound; +extern bool use_music; +extern bool use_graphics; +extern bool use_bigtile; + /* * Available "options" * diff --git a/src/variable.c b/src/variable.c index 209cd101b..308481197 100644 --- a/src/variable.c +++ b/src/variable.c @@ -103,11 +103,6 @@ s16b running; /* Current counter for running, if any */ GAME_TURN old_battle; -bool use_sound; /* The "sound" mode is enabled */ -bool use_music; /* The "music" mode is enabled */ -bool use_graphics; /* The "graphics" mode is enabled */ -bool use_bigtile = FALSE; - s16b signal_count; /* Hack -- Count interupts */ bool inkey_base; /* See the "inkey()" function */ -- 2.11.0