[Refactor] #37353 テキストポジション定義を view-mainwindow.c に移動。 / Definitions of text position...

diff --git a/src/defines.h b/src/defines.h
index 9108712..19b61ec 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -620,92 +620,10 @@
 
 #define VER_INFO_ROW 3   //!< タイトル表記(行)
 
-/*
- * Some screen locations for various display routines
- * Currently, row 8 and 15 are the only "blank" rows.
- * That leaves a "border" around the "stat" values.
- */
-
-#define ROW_RACE                1
-#define COL_RACE                0       /* <race name> */
-
-/*#define ROW_CLASS               2 */
-/*#define COL_CLASS               0 */      /* <class name> */
-
-#define ROW_TITLE               2
-#define COL_TITLE               0       /* <title> or <mode> */
-
-/*#define ROW_SEIKAKU          4 */
-/*#define COL_SEIKAKU          0*/     /* <seikaku> */
-
-#define ROW_DAY                 21
-#define COL_DAY                 0       /* day */
-
-#define ROW_DUNGEON             22
-#define COL_DUNGEON             0       /* dungeon */
-
-#define ROW_LEVEL               3
-#define COL_LEVEL               0       /* "LEVEL xxxxxx" */
-
-#define ROW_EXP                 4
-#define COL_EXP                 0       /* "EXP xxxxxxxx" */
-
-#define ROW_GOLD                5
-#define COL_GOLD                0       /* "AU xxxxxxxxx" */
-
-#define ROW_EQUIPPY             6
-#define COL_EQUIPPY             0       /* equippy chars */
-
-#define ROW_STAT                7
-#define COL_STAT                0       /* "xxx   xxxxxx" */
-
-#define ROW_AC                  13
-#define COL_AC                  0       /* "Cur AC xxxxx" */
-
-#define ROW_HPMP                14
-#define COL_HPMP                0
-
-#define ROW_CURHP               14
-#define COL_CURHP               0       /* "Cur HP xxxxx" */
-
-#define ROW_CURSP               15
-#define COL_CURSP               0       /* "Cur SP xxxxx" */
-
-#define ROW_RIDING_INFO         16
-#define COL_RIDING_INFO         0       /* "xxxxxxxxxxxx" */
-
-#define ROW_INFO                17
-#define COL_INFO                0       /* "xxxxxxxxxxxx" */
 
 #define ROW_MAP                 0
 #define COL_MAP                 12
 
-#define ROW_CUT                 18
-#define COL_CUT                 0       /* <cut> */
-
-#define ROW_STUN                19
-#define COL_STUN                0       /* <stun> */
-
-#define ROW_HUNGRY              20
-#define COL_HUNGRY              0       /* "Weak" / "Hungry" / "Full" / "Gorged" */
-
-#define ROW_STATE               20
-#define COL_STATE                7      /* <state> */
-
-#define ROW_SPEED               (-1)
-#define COL_SPEED               (-24)      /* "Slow (-NN)" or "Fast (+NN)" */
-
-#define ROW_STUDY               (-1)
-#define COL_STUDY               (-13)      /* "Study" */
-
-#define ROW_DEPTH               (-1)
-#define COL_DEPTH               (-8)      /* "Lev NNN" / "NNNN ft" */
-
-#define ROW_STATBAR             (-1)
-#define COL_STATBAR              0
-#define MAX_COL_STATBAR         (-26)
-
-
 /*
  * Number of feats we change to (Excluding default). Used in f_info.txt.
  */

diff --git a/src/externs.h b/src/externs.h
index d50534a..1b8629e 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -572,6 +572,7 @@ extern errr process_pref_file(concptr name);
 extern errr process_autopick_file(concptr name);
 extern errr process_histpref_file(concptr name);
 extern void print_equippy(void);
+extern void display_player_equippy(TERM_LEN y, TERM_LEN x, BIT_FLAGS16 mode);
 extern errr check_time_init(void);
 extern errr check_load_init(void);
 extern errr check_time(void);

diff --git a/src/files.c b/src/files.c
index c56857d..c1ed143 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2794,7 +2794,7 @@ static void tim_player_flags(BIT_FLAGS flgs[TR_FLAG_SIZE])
  * @param mode オプション
  * @return なし
  */
-static void display_player_equippy(TERM_LEN y, TERM_LEN x, BIT_FLAGS16 mode)
+void display_player_equippy(TERM_LEN y, TERM_LEN x, BIT_FLAGS16 mode)
 {
        int i, max_i;
 
@@ -2830,15 +2830,6 @@ static void display_player_equippy(TERM_LEN y, TERM_LEN x, BIT_FLAGS16 mode)
 
 
 /*!
- * @brief プレイヤーの装備一覧シンボルを固定位置に表示する
- * @return なし
- */
-void print_equippy(void)
-{
-       display_player_equippy(ROW_EQUIPPY, COL_EQUIPPY, 0);
-}
-
-/*!
  * @brief プレイヤーの装備による免疫フラグを返す
  * @param flgs フラグを保管する配列
  * @return なし

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 1d74198..73e4706 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -17,6 +17,87 @@
 #include "avatar.h"
 #include "player-status.h"
 
+ /*
+  * Some screen locations for various display routines
+  * Currently, row 8 and 15 are the only "blank" rows.
+  * That leaves a "border" around the "stat" values.
+  */
+
+#define ROW_RACE                1
+#define COL_RACE                0       /* <race name> */
+
+  /*#define ROW_CLASS               2 */
+  /*#define COL_CLASS               0 */      /* <class name> */
+
+#define ROW_TITLE               2
+#define COL_TITLE               0       /* <title> or <mode> */
+
+/*#define ROW_SEIKAKU          4 */
+/*#define COL_SEIKAKU          0*/     /* <seikaku> */
+
+#define ROW_DAY                 21
+#define COL_DAY                 0       /* day */
+
+#define ROW_DUNGEON             22
+#define COL_DUNGEON             0       /* dungeon */
+
+#define ROW_LEVEL               3
+#define COL_LEVEL               0       /* "LEVEL xxxxxx" */
+
+#define ROW_EXP                 4
+#define COL_EXP                 0       /* "EXP xxxxxxxx" */
+
+#define ROW_GOLD                5
+#define COL_GOLD                0       /* "AU xxxxxxxxx" */
+
+#define ROW_EQUIPPY             6
+#define COL_EQUIPPY             0       /* equippy chars */
+
+#define ROW_STAT                7
+#define COL_STAT                0       /* "xxx   xxxxxx" */
+
+#define ROW_AC                  13
+#define COL_AC                  0       /* "Cur AC xxxxx" */
+
+#define ROW_HPMP                14
+#define COL_HPMP                0
+
+#define ROW_CURHP               14
+#define COL_CURHP               0       /* "Cur HP xxxxx" */
+
+#define ROW_CURSP               15
+#define COL_CURSP               0       /* "Cur SP xxxxx" */
+
+#define ROW_RIDING_INFO         16
+#define COL_RIDING_INFO         0       /* "xxxxxxxxxxxx" */
+
+#define ROW_INFO                17
+#define COL_INFO                0       /* "xxxxxxxxxxxx" */
+
+#define ROW_CUT                 18
+#define COL_CUT                 0       /* <cut> */
+
+#define ROW_STUN                19
+#define COL_STUN                0       /* <stun> */
+
+#define ROW_HUNGRY              20
+#define COL_HUNGRY              0       /* "Weak" / "Hungry" / "Full" / "Gorged" */
+
+#define ROW_STATE               20
+#define COL_STATE                7      /* <state> */
+
+#define ROW_SPEED               (-1)
+#define COL_SPEED               (-24)      /* "Slow (-NN)" or "Fast (+NN)" */
+
+#define ROW_STUDY               (-1)
+#define COL_STUDY               (-13)      /* "Study" */
+
+#define ROW_DEPTH               (-1)
+#define COL_DEPTH               (-8)      /* "Lev NNN" / "NNNN ft" */
+
+#define ROW_STATBAR             (-1)
+#define COL_STATBAR              0
+#define MAX_COL_STATBAR         (-26)
 /*!
  * @brief 現在の修正後能力値を3～17及び18/xxx形式に変換する / Converts stat num into a six-char (right justified) string
  * @param val 能力値
@@ -2447,3 +2528,11 @@ bool change_panel(POSITION dy, POSITION dx)
        return (FALSE);
 }
 
+/*!
+ * @brief プレイヤーの装備一覧シンボルを固定位置に表示する
+ * @return なし
+ */
+void print_equippy(void)
+{
+       display_player_equippy(ROW_EQUIPPY, COL_EQUIPPY, 0);
+}
\ No newline at end of file