[Refactor] #37353 ゲームメッセージの日英切り替えマクロを util.h へ移動．

diff --git a/src/defines.h b/src/defines.h
index 8f74162..0570811 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -39,13 +39,3 @@
  */
 
 /*** Screen Locations ***/
-
-
-/*
-  Language selection macro
-*/
-#ifdef JP
-#define _(JAPANESE,ENGLISH) (JAPANESE)
-#else
-#define _(JAPANESE,ENGLISH) (ENGLISH)
-#endif

diff --git a/src/util.h b/src/util.h
index 19bf95d..08d1e0a 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -60,6 +60,16 @@ extern int PlayerUID;
 #define have_pval_flags(ARRAY) !!((ARRAY)[0] & (0x00003f7f))
 
  /*
+   Language selection macro
+ */
+#ifdef JP
+#define _(JAPANESE,ENGLISH) (JAPANESE)
+#else
+#define _(JAPANESE,ENGLISH) (ENGLISH)
+#endif
+
+
+ /*
  * Sort-array element
  */
 typedef struct tag_type tag_type;