[Refactor] #37353 kamae 構造体と関連変数を player-effects.c/h へ移動．

diff --git a/src/externs.h b/src/externs.h
index 9425e74..3cf1961 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -83,8 +83,6 @@ extern const concptr stat_names_reduced[6];
 extern const concptr window_flag_desc[32];
 
 extern const concptr game_inscriptions[];
 extern const concptr window_flag_desc[32];
 
 extern const concptr game_inscriptions[];

-extern const kamae kamae_shurui[MAX_KAMAE];
-extern const kamae kata_shurui[MAX_KATA];

 
 extern const concptr ident_info[];
 extern const byte feature_action_flags[FF_FLAG_MAX];
 
 extern const concptr ident_info[];
 extern const byte feature_action_flags[FF_FLAG_MAX];

diff --git a/src/files.c b/src/files.c
index d748f5d..ee4d25b 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -29,6 +29,7 @@
 #include "player-skill.h"
 #include "player-personality.h"
 #include "player-sex.h"
 #include "player-skill.h"
 #include "player-personality.h"
 #include "player-sex.h"

+#include "player-effects.h"

 #include "sort.h"
 #include "mutation.h"
 #include "quest.h"
 #include "sort.h"
 #include "mutation.h"
 #include "quest.h"

diff --git a/src/player-effects.c b/src/player-effects.c
index 131685a..3529728 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -45,6 +45,44 @@
 #include "objectkind.h"
 #include "autopick.h"
 
 #include "objectkind.h"
 #include "autopick.h"
 

+
+ /*!
+  * @brief 修行僧の構え能力テーブル
+  */
+const kamae kamae_shurui[MAX_KAMAE] =
+{
+#ifdef JP
+       {"玄武", 25, ""},
+       {"白虎", 30, ""},
+       {"青竜", 35, ""},
+       {"朱雀", 40, ""},
+#else
+       {"Genbu", 25, "(Black Tortoise) "},
+       {"Byakko", 30, "(White Tiger) "},
+       {"Seiryuu", 35, "(Blue Dragon) "},
+       {"Suzaku", 40, "(Red Phoenix) "},
+#endif
+};
+
+/*!
+ * @brief 剣術家の構え能力テーブル
+ */
+const kamae kata_shurui[MAX_KATA] =
+{
+#ifdef JP
+       {"居合", 25, ""},
+       {"風塵", 30, ""},
+       {"降鬼", 35, ""},
+       {"無想", 40, ""},
+#else
+       {"Iai", 25, ""},
+       {"Huujin", 30, ""},
+       {"Kouki", 35, ""},
+       {"Musou", 40, ""},
+#endif
+};
+
+

 /*!
  * @brief プレイヤーの継続行動を設定する。
  * @param typ 継続行動のID\n
 /*!
  * @brief プレイヤーの継続行動を設定する。
  * @param typ 継続行動のID\n

diff --git a/src/player-effects.h b/src/player-effects.h
index ff1705d..5a1f203 100644 (file)
--- a/src/player-effects.h
+++ b/src/player-effects.h
@@ -1,5 +1,14 @@
 #pragma once
 
 #pragma once
 

+typedef struct kamae kamae;
+
+struct kamae
+{
+       concptr desc;       /* A verbose kamae description */
+       PLAYER_LEVEL min_level;  /* Minimum level to use */
+       concptr info;
+};
+

 /* effects.c */
 extern void set_action(ACTION_IDX typ);
 extern void reset_tim_flags(void);
 /* effects.c */
 extern void set_action(ACTION_IDX typ);
 extern void reset_tim_flags(void);


@@ -72,3 +81,6 @@ extern bool set_tim_esp(TIME_EFFECT v, bool do_dec);
 extern bool set_superstealth(bool set);
 extern void do_poly_wounds(void);
 extern void change_race(CHARACTER_IDX new_race, concptr effect_msg);
 extern bool set_superstealth(bool set);
 extern void do_poly_wounds(void);
 extern void change_race(CHARACTER_IDX new_race, concptr effect_msg);

+
+extern const kamae kamae_shurui[MAX_KAMAE];
+extern const kamae kata_shurui[MAX_KATA];

diff --git a/src/tables.c b/src/tables.c
index b176e61..6503ff7 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -2290,43 +2290,6 @@ const concptr game_inscriptions[] =
 };
 
 /*!
 };
 
 /*!

- * @brief 修行僧の構え能力テーブル
- */
-const kamae kamae_shurui[MAX_KAMAE] =
-{
-#ifdef JP
-       {"玄武", 25, ""},
-       {"白虎", 30, ""},
-       {"青竜", 35, ""},
-       {"朱雀", 40, ""},
-#else
-       {"Genbu", 25, "(Black Tortoise) "},
-       {"Byakko", 30, "(White Tiger) "},
-       {"Seiryuu", 35, "(Blue Dragon) "},
-       {"Suzaku", 40, "(Red Phoenix) "},
-#endif
-};
-
-/*!
- * @brief 剣術家の構え能力テーブル
- */
-const kamae kata_shurui[MAX_KATA] =
-{
-#ifdef JP
-       {"居合", 25, ""},
-       {"風塵", 30, ""},
-       {"降鬼", 35, ""},
-       {"無想", 40, ""},
-#else
-       {"Iai", 25, ""},
-       {"Huujin", 30, ""},
-       {"Kouki", 35, ""},
-       {"Musou", 40, ""},
-#endif
-};
-
-
-/*!

  * @brief シンボル解説テーブル /
  * The table of "symbol info" -- each entry is a string of the form "X:desc" where "X" is the trigger, and "desc" is the "info".
  */
  * @brief シンボル解説テーブル /
  * The table of "symbol info" -- each entry is a string of the form "X:desc" where "X" is the trigger, and "desc" is the "info".
  */

diff --git a/src/types.h b/src/types.h
index bb979e3..2234209 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -66,20 +66,8 @@ struct magic_type
        EXP sexp;                               /* Encoded experience bonus */
 };
 
        EXP sexp;                               /* Encoded experience bonus */
 };
 

-
-typedef struct kamae kamae;
-
-struct kamae
-{
-       concptr desc;       /* A verbose kamae description */
-       PLAYER_LEVEL min_level;  /* Minimum level to use */
-       concptr info;
-};
-
-

 typedef bool (*monsterrace_hook_type)(MONRACE_IDX r_idx);
 
 typedef bool (*monsterrace_hook_type)(MONRACE_IDX r_idx);
 

-

 /*
  * This seems like a pretty standard "typedef"
  */
 /*
  * This seems like a pretty standard "typedef"
  */

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index 63e58c0..04693dd 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -22,6 +22,7 @@
 #include "player-status.h"
 #include "player-class.h"
 #include "player-race.h"
 #include "player-status.h"
 #include "player-class.h"
 #include "player-race.h"

+#include "player-effects.h"

 #include "monster.h"
 #include "view-mainwindow.h"
 
 #include "monster.h"
 #include "view-mainwindow.h"