[Refactor] #37353 skill_table と関連配列を player-skill.c/h へ移動。

diff --git a/src/externs.h b/src/externs.h
index 2d1666f..31b2681 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -243,7 +243,6 @@ extern const player_class *cp_ptr;
 extern const player_seikaku *ap_ptr;
 extern const player_magic *mp_ptr;
 extern birther previous_char;
-extern skill_table *s_info;
 extern player_magic *m_info;
 extern char *f_name;
 extern char *f_tag;

diff --git a/src/init.c b/src/init.c
index 3c03b21..fa6809f 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -49,6 +49,7 @@
 #include "floor.h"
 #include "dungeon.h"
 #include "rooms-vault.h"
+#include "player-skill.h"
 
 #ifndef MACINTOSH
 #ifdef CHECK_MODIFICATION_TIME

diff --git a/src/player-skill.c b/src/player-skill.c
index db6ddd8..3f03b45 100644 (file)
--- a/src/player-skill.c
+++ b/src/player-skill.c
@@ -1,6 +1,11 @@
 #include "angband.h"
 #include "player-skill.h"
 
+/*
+ * The skill table
+ */
+skill_table *s_info;
+
 /*!
  * @brief 技能値到達表記テーブル
  */

diff --git a/src/player-skill.h b/src/player-skill.h
index 1012a5d..22445f1 100644 (file)
--- a/src/player-skill.h
+++ b/src/player-skill.h
@@ -2,13 +2,28 @@
 
 extern const concptr exp_level_str[5];
 
+/*
+ * Information about "skill"
+ */
+
+typedef struct skill_table skill_table;
+
+struct skill_table
+{
+       SUB_EXP w_start[5][64];   /* start weapon exp */
+       SUB_EXP w_max[5][64];        /* max weapon exp */
+       SUB_EXP s_start[10];      /* start skill */
+       SUB_EXP s_max[10];           /* max skill */
+};
+
+extern skill_table *s_info;
+
 #define GINOU_SUDE      0
 #define GINOU_NITOURYU  1
 #define GINOU_RIDING    2
 #define GINOU_SHIELD    3
 #define GINOU_TEMPMAX   4
 
-
 /* Proficiency level */
 #define EXP_LEVEL_UNSKILLED 0
 #define EXP_LEVEL_BEGINNER  1

diff --git a/src/types.h b/src/types.h
index ac917fb..e5fbc70 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -594,21 +594,6 @@ struct monster_race
 
 
 /*
- * Information about "skill"
- */
-
-typedef struct skill_table skill_table;
-
-struct skill_table
-{
-       SUB_EXP w_start[5][64];   /* start weapon exp */
-       SUB_EXP w_max[5][64];        /* max weapon exp */
-       SUB_EXP s_start[10];      /* start skill */
-       SUB_EXP s_max[10];           /* max skill */
-};
-
-
-/*
  * A single "grid" in a Cave
  *
  * Note that several aspects of the code restrict the actual current_floor_ptr->grid_array

diff --git a/src/variable.c b/src/variable.c
index e3f6017..6fd1e4b 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -533,11 +533,6 @@ const player_magic *mp_ptr;
 birther previous_char;
 
 /*
- * The skill table
- */
-skill_table *s_info;
-
-/*
  * The magic info
  */
 player_magic *m_info;