[Refactor] #37353 p_ptr, p_body を player-status.c/h へ移動．

diff --git a/src/externs.h b/src/externs.h
index 7b78092..5e64faf 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -47,12 +47,3 @@ extern const byte adj_chr_chm[];
 
 extern bool repair_monsters;
 extern bool repair_objects;
-
-
-
-/*
- * Software options (set via the '=' command).  See "tables.c"
- */
-
-
-extern player_type *p_ptr;

diff --git a/src/player-status.c b/src/player-status.c
index d6fbe42..7a08bbd 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -335,6 +335,17 @@ const s32b player_exp_a[PY_MAX_LEVEL] =
        5000000L
 };
 
+/*** Player information ***/
+
+/*
+ * Static player info record
+ */
+player_type p_body;
+
+/*
+ * Pointer to the player info
+ */
+player_type *p_ptr = &p_body;
 
 /*
  * Return alignment title

diff --git a/src/player-status.h b/src/player-status.h
index 00c7628..4016c2e 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -700,6 +700,7 @@ struct player_type
        char base_name[32]; /*!< Stripped version of "player_name" */
 
 };
+extern player_type *p_ptr;
 
 extern concptr your_alignment(void);
 extern int weapon_exp_level(int weapon_exp);

diff --git a/src/variable.c b/src/variable.c
index 589d292..f2227b3 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -16,18 +16,3 @@
 
 bool repair_monsters;  /* Hack -- optimize detect monsters */
 bool repair_objects;   /* Hack -- optimize detect objects */
-
-
-/*** Player information ***/
-
-/*
- * Static player info record
- */
-player_type p_body;
-
-/*
- * Pointer to the player info
- */
-player_type *p_ptr = &p_body;
-
-