[Refactor] #37353 quark__num, quark__str を util.c/h へ移動．

diff --git a/src/externs.h b/src/externs.h
index 0c422f5..0266f24 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -54,8 +54,6 @@ extern bool repair_objects;
  * Software options (set via the '=' command).  See "tables.c"
  */
 
-extern STR_OFFSET quark__num;
-extern concptr *quark__str;
 
 extern player_type *p_ptr;
 

diff --git a/src/util.c b/src/util.c
index 204f61a..f60310e 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -108,6 +108,16 @@ bool use_menu;
 
 pos_list tmp_pos;
 
+/*
+ * The number of quarks
+ */
+STR_OFFSET quark__num;
+
+/*
+ * The pointers to the quarks [QUARK_MAX]
+ */
+concptr *quark__str;
+
 static int num_more = 0;
 
 /* Save macro trigger string for use in inkey_special() */
@@ -130,6 +140,7 @@ TERM_LEN command_gap = 999;         /* See "object1.c" */
 s16b command_new;              /* Command chaining from inven/equip view */
 
 
+
 #if 0
 #ifndef HAS_STRICMP
 

diff --git a/src/util.h b/src/util.h
index f9ca5df..def30fe 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -128,6 +128,8 @@ extern bool use_menu;
 
 extern pos_list tmp_pos;
 
+extern STR_OFFSET quark__num;
+extern concptr *quark__str;
 /*
  * Automatically generated "variable" declarations
  */

diff --git a/src/variable.c b/src/variable.c
index 519ef27..f4be029 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -18,18 +18,6 @@ bool repair_monsters;        /* Hack -- optimize detect monsters */
 bool repair_objects;   /* Hack -- optimize detect objects */
 
 
-/*
- * The number of quarks
- */
-STR_OFFSET quark__num;
-
-/*
- * The pointers to the quarks [QUARK_MAX]
- */
-concptr *quark__str;
-
-
-
 /*** Player information ***/
 
 /*