[Refactor] #37353 player-class.c/h を作成して player_magic 構造体と関連変数を移動．

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj b/Hengband_vcs2017/Hengband/Hengband.vcxproj
index 0ec248c..73124fc 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -172,6 +172,7 @@
     <ClCompile Include="..\..\src\objectkind-hook.c" />\r
     <ClCompile Include="..\..\src\object-broken.c" />\r
     <ClCompile Include="..\..\src\patron.c" />\r
+    <ClCompile Include="..\..\src\player-class.c" />\r
     <ClCompile Include="..\..\src\player-damage.c" />\r
     <ClCompile Include="..\..\src\player-effects.c" />\r
     <ClCompile Include="..\..\src\player-skill.c" />\r
@@ -325,6 +326,7 @@
     <ClInclude Include="..\..\src\object.h" />\r
     <ClInclude Include="..\..\src\objectkind-hook.h" />\r
     <ClInclude Include="..\..\src\patron.h" />\r
+    <ClInclude Include="..\..\src\player-class.h" />\r
     <ClInclude Include="..\..\src\player-damage.h" />\r
     <ClInclude Include="..\..\src\player-effects.h" />\r
     <ClInclude Include="..\..\src\player-move.h" />\r

diff --git a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
index 2166f46..342d0d6 100644 (file)
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -321,6 +321,9 @@
     <ClCompile Include="..\..\src\dungeon.c">
       <Filter>floor</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\player-class.c">
+      <Filter>player</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\angband.h" />
@@ -605,6 +608,9 @@
     <ClInclude Include="..\..\src\dungeon.h">
       <Filter>floor</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\player-class.h">
+      <Filter>player</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\angband.rc" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 65c32da..8a79cce 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,7 +55,7 @@ hengband_SOURCES = \
        projection.h projection.c\
        \
        player-move.c player-move.h player-damage.c player-damage.h player-status.c player-status.h \
-       player-effects.c player-effects.h player-skill.c player-skill.h \
+       player-effects.c player-effects.h player-skill.c player-skill.h player-class.c player-class.h \
        \
        quest.h quest.c\
        \

diff --git a/src/birth.c b/src/birth.c
index 9833d38..ca1d2a5 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -22,6 +22,7 @@
 #include "store.h"
 #include "patron.h"
 #include "quest.h"
+#include "player-class.h"
 #include "player-status.h"
 #include "spells.h"
 #include "spells-status.h"

diff --git a/src/cmd-magiceat.c b/src/cmd-magiceat.c
index 97fa4cd..08bf3cb 100644 (file)
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -62,6 +62,7 @@
 #include "avatar.h"
 #include "player-status.h"
 #include "spells.h"
+#include "player-class.h"
 
 
 /*!

diff --git a/src/cmd-spell.c b/src/cmd-spell.c
index f456f97..f425480 100644 (file)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -30,6 +30,7 @@
 #include "player-status.h"
 #include "player-effects.h"
 #include "player-skill.h"
+#include "player-class.h"
 #include "object-hook.h"
 #include "cmd-basic.h"
 #include "view-mainwindow.h"

diff --git a/src/cmd4.c b/src/cmd4.c
index 436e471..83517e2 100644 (file)
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -64,6 +64,7 @@
 #include "view-mainwindow.h"
 #include "dungeon-file.h"
 #include "files.h"
+#include "player-class.h"
 
 /*
  */

diff --git a/src/core.c b/src/core.c
index 20a71ef..f2bf131 100644 (file)
--- a/src/core.c
+++ b/src/core.c
@@ -51,6 +51,7 @@
 #include "avatar.h"
 #include "player-move.h"
 #include "player-status.h"
+#include "player-class.h"
 #include "cmd-spell.h"
 #include "realm-hex.h"
 #include "object-hook.h"

diff --git a/src/dungeon-file.c b/src/dungeon-file.c
index 080696f..0aa8c9c 100644 (file)
--- a/src/dungeon-file.c
+++ b/src/dungeon-file.c
@@ -76,6 +76,7 @@ dungeon_grid letter[255];
 #include "wild.h"
 #include "quest.h"
 #include "view-mainwindow.h"
+#include "player-class.h"
 
 
 

diff --git a/src/externs.h b/src/externs.h
index c058349..2c6b84f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -230,9 +230,7 @@ extern const player_sex *sp_ptr;
 extern const player_race *rp_ptr;
 extern const player_class *cp_ptr;
 extern const player_seikaku *ap_ptr;
-extern const player_magic *mp_ptr;
 extern birther previous_char;
-extern player_magic *m_info;
 extern char *f_name;
 extern char *f_tag;
 extern object_kind *k_info;

diff --git a/src/init.c b/src/init.c
index 1e5c8fd..f03e097 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -50,6 +50,7 @@
 #include "dungeon.h"
 #include "rooms-vault.h"
 #include "player-skill.h"
+#include "player-class.h"
 
 #ifndef MACINTOSH
 #ifdef CHECK_MODIFICATION_TIME

diff --git a/src/load.c b/src/load.c
index 510415e..cccd56f 100644 (file)
--- a/src/load.c
+++ b/src/load.c
@@ -67,6 +67,7 @@
 #include "dungeon-file.h"
 #include "files.h"
 #include "player-skill.h"
+#include "player-class.h"
 #include "world.h"
 
 

diff --git a/src/mind.c b/src/mind.c
index 559977c..8de4155 100644 (file)
--- a/src/mind.c
+++ b/src/mind.c
@@ -26,6 +26,7 @@
 #include "avatar.h"
 #include "player-move.h"
 #include "player-status.h"
+#include "player-class.h"
 #include "spells-status.h"
 #include "cmd-spell.h"
 #include "spells-floor.h"

diff --git a/src/player-class.c b/src/player-class.c
new file mode 100644 (file)
index 0000000..cdc3a93
--- /dev/null
+++ b/src/player-class.c
@@ -0,0 +1,9 @@
+
+#include "angband.h"
+#include "player-class.h"
+
+/*
+ * The magic info
+ */
+const player_magic *mp_ptr;
+player_magic *m_info;

diff --git a/src/player-class.h b/src/player-class.h
new file mode 100644 (file)
index 0000000..6bd9f4a
--- /dev/null
+++ b/src/player-class.h
@@ -0,0 +1,26 @@
+#pragma once
+
+/*
+ * Information about the player's "magic"
+ *
+ * Note that a player with a "spell_book" of "zero" is illiterate.
+ */
+
+typedef struct player_magic player_magic;
+
+struct player_magic
+{
+       OBJECT_TYPE_VALUE spell_book; /* Tval of spell books (if any) */
+       int spell_xtra;         /* Something for later */
+
+       int spell_stat;         /* Stat for spells (if any)  */
+       int spell_type;         /* Spell type (mage/priest) */
+
+       int spell_first;                /* Level of first spell */
+       int spell_weight;               /* Weight that hurts spells */
+
+       magic_type info[MAX_MAGIC][32];    /* The available spells */
+};
+
+extern player_magic *m_info;
+extern const player_magic *mp_ptr;

diff --git a/src/player-status.c b/src/player-status.c
index 6ac44c1..8f6ef4f 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -22,6 +22,7 @@
 #include "cmd-pet.h"
 #include "cmd-spell.h"
 #include "dungeon.h"
+#include "player-class.h"
 
 /*!
  * @var horror_desc

diff --git a/src/spells-object.c b/src/spells-object.c
index 33eddd5..5688742 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -13,6 +13,7 @@
 #include "player-status.h"
 #include "avatar.h"
 #include "player-effects.h"
+#include "player-class.h"
 
 
 typedef struct

diff --git a/src/spells3.c b/src/spells3.c
index f66b39f..5143549 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -23,6 +23,7 @@
 #include "melee.h"
 #include "player-move.h"
 #include "player-status.h"
+#include "player-class.h"
 #include "spells-summon.h"
 #include "quest.h"
 #include "artifact.h"

diff --git a/src/types.h b/src/types.h
index c19b74c..eaf6036 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -934,30 +934,6 @@ struct magic_type
 
 
 /*
- * Information about the player's "magic"
- *
- * Note that a player with a "spell_book" of "zero" is illiterate.
- */
-
-typedef struct player_magic player_magic;
-
-struct player_magic
-{
-       OBJECT_TYPE_VALUE spell_book; /* Tval of spell books (if any) */
-       int spell_xtra;         /* Something for later */
-
-       int spell_stat;         /* Stat for spells (if any)  */
-       int spell_type;         /* Spell type (mage/priest) */
-
-       int spell_first;                /* Level of first spell */
-       int spell_weight;               /* Weight that hurts spells */
-
-       magic_type info[MAX_MAGIC][32];    /* The available spells */
-};
-
-
-
-/*
  * Player sex info
  */
 

diff --git a/src/variable.c b/src/variable.c
index 4414dc2..cc594c4 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -494,7 +494,6 @@ const player_sex *sp_ptr;
 const player_race *rp_ptr;
 const player_class *cp_ptr;
 const player_seikaku *ap_ptr;
-const player_magic *mp_ptr;
 
 
 /*
@@ -504,11 +503,6 @@ const player_magic *mp_ptr;
 birther previous_char;
 
 /*
- * The magic info
- */
-player_magic *m_info;
-
-/*
  * The object kind arrays
  */
 object_kind *k_info;

diff --git a/src/view-mainwindow.c b/src/view-mainwindow.c
index f7aabf3..a951bee 100644 (file)
--- a/src/view-mainwindow.c
+++ b/src/view-mainwindow.c
@@ -19,6 +19,7 @@
 #include "artifact.h"
 #include "avatar.h"
 #include "player-status.h"
+#include "player-class.h"
 #include "monster.h"
 #include "view-mainwindow.h"