[Refactor] #37353 Windows版オプションフラグ use_* を gameoption.c/h へ移動．

diff --git a/src/externs.h b/src/externs.h
index d1c8e64..d156370 100644 (file)
--- 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 773219e..1f7852b 100644 (file)
--- 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 0d0f1aa..69f0d64 100644 (file)
--- 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 209cd10..3084811 100644 (file)
--- 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 */