[Refactor] #37353 cmd4.c を cmd-dump.c に改名して関数整理．

[hengband/hengband.git] / src / player-effects.c

diff --git a/src/player-effects.c b/src/player-effects.c
index 85e81eb..2f6385b 100644 (file)
--- a/src/player-effects.c
+++ b/src/player-effects.c
@@ -13,23 +13,76 @@
  */
 
 #include "angband.h"
+#include "util.h"
+
+#include "artifact.h"
+#include "cmd-dump.h"
+#include "floor.h"
+#include "bldg.h"
 #include "birth.h"
 #include "grid.h"
 #include "mutation.h"
 #include "quest.h"
 #include "avatar.h"
-#include "player-status.h"
 #include "spells-status.h"
 #include "realm-hex.h"
+#include "object-ego.h"
 #include "object-hook.h"
 #include "wild.h"
 #include "spells-floor.h"
+#include "player-status.h"
+#include "player-class.h"
 #include "player-move.h"
 #include "player-effects.h"
+#include "player-race.h"
+#include "player-class.h"
+#include "player-personality.h"
+#include "player-sex.h"
 #include "monster-status.h"
 #include "snipe.h"
 #include "files.h"
-#include "player-effects.h"
+#include "monster-spell.h"
+#include "world.h"
+#include "objectkind.h"
+#include "autopick.h"
+
+
+ /*!
+  * @brief 修行僧の構え能力テーブル
+  */
+const kamae kamae_shurui[MAX_KAMAE] =
+{
+#ifdef JP
+       {"玄武", 25, ""},
+       {"白虎", 30, ""},
+       {"青竜", 35, ""},
+       {"朱雀", 40, ""},
+#else
+       {"Genbu", 25, "(Black Tortoise) "},
+       {"Byakko", 30, "(White Tiger) "},
+       {"Seiryuu", 35, "(Blue Dragon) "},
+       {"Suzaku", 40, "(Red Phoenix) "},
+#endif
+};
+
+/*!
+ * @brief 剣術家の構え能力テーブル
+ */
+const kamae kata_shurui[MAX_KATA] =
+{
+#ifdef JP
+       {"居合", 25, ""},
+       {"風塵", 30, ""},
+       {"降鬼", 35, ""},
+       {"無想", 40, ""},
+#else
+       {"Iai", 25, ""},
+       {"Huujin", 30, ""},
+       {"Kouki", 35, ""},
+       {"Musou", 40, ""},
+#endif
+};
+
 
 /*!
  * @brief プレイヤーの継続行動を設定する。
@@ -3589,9 +3642,7 @@ bool lose_all_info(void)
        /* Forget info about objects */
        for (i = 0; i < INVEN_TOTAL; i++)
        {
-               object_type *o_ptr = &inventory[i];
-
-               /* Skip non-objects */
+               object_type *o_ptr = &p_ptr->inventory_list[i];
                if (!o_ptr->k_idx) continue;
 
                /* Allow "protection" by the MENTAL flag */
@@ -4239,7 +4290,7 @@ void calc_android_exp(void)
 
        for (i = INVEN_RARM; i < INVEN_TOTAL; i++)
        {
-               object_type *o_ptr = &inventory[i];
+               object_type *o_ptr = &p_ptr->inventory_list[i];
                object_type forge;
                object_type *q_ptr = &forge;
                u32b value, exp;