[Refactor] #37353 magic_type 定義を spells.h へ移動．

diff --git a/src/player-class.h b/src/player-class.h
index 1ac2a85..482cd97 100644 (file)
--- a/src/player-class.h
+++ b/src/player-class.h
@@ -1,5 +1,5 @@
 #pragma once
-
+#include "spells.h"
 /*
  * Information about the player's "magic"
  *

diff --git a/src/spells.h b/src/spells.h
index 36341e0..f01c62f 100644 (file)
--- a/src/spells.h
+++ b/src/spells.h
@@ -112,6 +112,20 @@
 
 #define MAX_GF         117
 
+/*
+ * The "name" of spell 'N' is stored as spell_names[X][N],
+ * where X is 0 for mage-spells and 1 for priest-spells.
+ */
+typedef struct magic_type magic_type;
+
+struct magic_type
+{
+       PLAYER_LEVEL slevel;    /* Required level (to learn) */
+       MANA_POINT smana;               /* Required mana (to cast) */
+       PERCENTAGE sfail;               /* Minimum chance of failure */
+       EXP sexp;                               /* Encoded experience bonus */
+};
+
 extern const magic_type technic_info[NUM_TECHNIC][32];
 
 /* spells3.c */

diff --git a/src/types.h b/src/types.h
index 07a0cfa..f51f7e4 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -51,17 +51,3 @@
 
 //#include "player-skill.h"
 
-
-/*
- * The "name" of spell 'N' is stored as spell_names[X][N],
- * where X is 0 for mage-spells and 1 for priest-spells.
- */
-typedef struct magic_type magic_type;
-
-struct magic_type
-{
-       PLAYER_LEVEL slevel;    /* Required level (to learn) */
-       MANA_POINT smana;               /* Required mana (to cast) */
-       PERCENTAGE sfail;               /* Minimum chance of failure */
-       EXP sexp;                               /* Encoded experience bonus */
-};