[Refactor] #37353 player_exp と player_exp_a を player-status.c/h へ移動。

diff --git a/src/externs.h b/src/externs.h
index 05140df..1b424a1 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -70,8 +70,6 @@ extern const byte adj_chr_chm[];
 extern const byte blows_table[12][12];
 extern const arena_type arena_info[MAX_ARENA_MONS + 2];
 extern const byte extract_energy[200];
-extern const s32b player_exp[PY_MAX_LEVEL];
-extern const s32b player_exp_a[PY_MAX_LEVEL];
 extern const player_sex sex_info[MAX_SEXES];
 extern const player_race race_info[MAX_RACES];
 extern const player_class class_info[MAX_CLASS];

diff --git a/src/player-status.c b/src/player-status.c
index 3e6f025..189ed0f 100644 (file)
--- a/src/player-status.c
+++ b/src/player-status.c
@@ -164,6 +164,123 @@ static concptr funny_comments[MAX_SAN_COMMENT] =
 };
 
 
+/*!
+ * @brief 基本必要経験値テーブル /
+ * Base experience levels, may be adjusted up for race and/or class
+ */
+const s32b player_exp[PY_MAX_LEVEL] =
+{
+       10,
+       25,
+       45,
+       70,
+       100,
+       140,
+       200,
+       280,
+       380,/*10*/
+       500,
+       650,
+       850,
+       1100,
+       1400,
+       1800,
+       2300,
+       2900,
+       3600,
+       4400,/*20*/
+       5400,
+       6800,
+       8400,
+       10200,
+       12500,
+       17500,
+       25000,
+       35000L,
+       50000L,
+       75000L,/*30*/
+       100000L,
+       150000L,
+       200000L,
+       275000L,
+       350000L,
+       450000L,
+       550000L,
+       700000L,
+       850000L,
+       1000000L,/*40*/
+       1250000L,
+       1500000L,
+       1800000L,
+       2100000L,
+       2400000L,
+       2700000L,
+       3000000L,
+       3500000L,
+       4000000L,
+       4500000L,/*50*/
+       5000000L
+};
+
+
+/*!
+ * @brief 基本必要強化値テーブル(アンドロイド専用)
+ */
+const s32b player_exp_a[PY_MAX_LEVEL] =
+{
+       20,
+       50,
+       100,
+       170,
+       280,
+       430,
+       650,
+       950,
+       1400,/*10*/
+       1850,
+       2300,
+       2900,
+       3600,
+       4400,
+       5400,
+       6800,
+       8400,
+       10400,
+       12500,/*20*/
+       17500,
+       25000,
+       35000,
+       50000L,
+       75000L,
+       100000L,
+       150000L,
+       200000L,
+       275000L,
+       350000L,/*30*/
+       450000L,
+       550000L,
+       650000L,
+       800000L,
+       950000L,
+       1100000L,
+       1250000L,
+       1400000L,
+       1550000L,
+       1700000L,/*40*/
+       1900000L,
+       2100000L,
+       2300000L,
+       2550000L,
+       2800000L,
+       3050000L,
+       3300000L,
+       3700000L,
+       4100000L,
+       4500000L,/*50*/
+       5000000L
+};
+
+
 /*
  * Return alignment title
  */

diff --git a/src/player-status.h b/src/player-status.h
index cef5330..51582ec 100644 (file)
--- a/src/player-status.h
+++ b/src/player-status.h
@@ -24,6 +24,10 @@ extern void wreck_the_pattern(void);
 extern void cnv_stat(int val, char *out_val);
 extern s16b modify_stat_value(int value, int amount);
 
+extern const s32b player_exp[PY_MAX_LEVEL];
+extern const s32b player_exp_a[PY_MAX_LEVEL];
+
+
 /* Temporary flags macro */
 #define IS_FAST() (p_ptr->fast || music_singing(MUSIC_SPEED) || music_singing(MUSIC_SHERO))
 #define IS_INVULN() (p_ptr->invuln || music_singing(MUSIC_INVULN))

diff --git a/src/tables.c b/src/tables.c
index 3448af2..66178a5 100644 (file)
--- a/src/tables.c
+++ b/src/tables.c
@@ -1255,124 +1255,6 @@ const byte extract_energy[200] =
 };
 
 
-
-/*!
- * @brief 基本必要経験値テーブル /
- * Base experience levels, may be adjusted up for race and/or class
- */
-const s32b player_exp[PY_MAX_LEVEL] =
-{
-       10,
-       25,
-       45,
-       70,
-       100,
-       140,
-       200,
-       280,
-       380,/*10*/
-       500,
-       650,
-       850,
-       1100,
-       1400,
-       1800,
-       2300,
-       2900,
-       3600,
-       4400,/*20*/
-       5400,
-       6800,
-       8400,
-       10200,
-       12500,
-       17500,
-       25000,
-       35000L,
-       50000L,
-       75000L,/*30*/
-       100000L,
-       150000L,
-       200000L,
-       275000L,
-       350000L,
-       450000L,
-       550000L,
-       700000L,
-       850000L,
-       1000000L,/*40*/
-       1250000L,
-       1500000L,
-       1800000L,
-       2100000L,
-       2400000L,
-       2700000L,
-       3000000L,
-       3500000L,
-       4000000L,
-       4500000L,/*50*/
-       5000000L
-};
-
-
-/*!
- * @brief 基本必要強化値テーブル(アンドロイド専用)
- */
-const s32b player_exp_a[PY_MAX_LEVEL] =
-{
-       20,
-       50,
-       100,
-       170,
-       280,
-       430,
-       650,
-       950,
-       1400,/*10*/
-       1850,
-       2300,
-       2900,
-       3600,
-       4400,
-       5400,
-       6800,
-       8400,
-       10400,
-       12500,/*20*/
-       17500,
-       25000,
-       35000,
-       50000L,
-       75000L,
-       100000L,
-       150000L,
-       200000L,
-       275000L,
-       350000L,/*30*/
-       450000L,
-       550000L,
-       650000L,
-       800000L,
-       950000L,
-       1100000L,
-       1250000L,
-       1400000L,
-       1550000L,
-       1700000L,/*40*/
-       1900000L,
-       2100000L,
-       2300000L,
-       2550000L,
-       2800000L,
-       3050000L,
-       3300000L,
-       3700000L,
-       4100000L,
-       4500000L,/*50*/
-       5000000L
-};
-
-
 /*!
  * @brief 性別表記 /
  * Player Sexes

diff --git a/src/xtra2.c b/src/xtra2.c
index 42d1b6a..4f0c5fb 100644 (file)
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -23,6 +23,7 @@
 #include "floor.h"
 #include "floor-events.h"
 #include "player-move.h"
+#include "player-status.h"
 #include "monster-status.h"
 
 /*!