[Refactor] #40514 player_type の resist_lite 変数を廃止. / Abolished the resist_lite variab...

[hengband/hengband.git] / src / player / player-class.h

diff --git a/src/player/player-class.h b/src/player/player-class.h
index bbe09c7..661c444 100644 (file)
--- a/src/player/player-class.h
+++ b/src/player/player-class.h
@@ -1,34 +1,11 @@
 #pragma once
 
-#include "system/angband.h"
+/* 人畜無害なenumヘッダを先に読み込む */
+#include "player/player-classes-types.h"
 #include "object/tval-types.h"
+#include "realm/realm-types.h"
+#include "system/angband.h"
 #include "spell/technic-info-table.h"
-#include "player/player-status.h"
-#include "player/player-classes-table.h"
-
-/*
- * 職業ごとの選択可能な魔法領域現在の所 bitrh.c でのみ使用。
- * Possible realms that can be chosen currently used only by birth.c.
- */
-#define CH_NONE         0x00
-#define CH_LIFE         0x01
-#define CH_SORCERY      0x02
-#define CH_NATURE       0x04
-#define CH_CHAOS        0x08
-#define CH_DEATH        0x10
-#define CH_TRUMP        0x20
-#define CH_ARCANE       0x40
-#define CH_ENCHANT      0x80
-#define CH_DAEMON       0x100
-#define CH_CRUSADE      0x200
-
-#define CH_MUSIC        0x08000        /* This is 16th bit */
-#define CH_HISSATSU     0x10000
-#define CH_HEX          0x20000
-
-#define IS_WIZARD_CLASS(C) \
-       ((C)->pclass == CLASS_MAGE || (C)->pclass == CLASS_HIGH_MAGE || (C)->pclass == CLASS_SORCERER || \
-       (C)->pclass == CLASS_MAGIC_EATER || (C)->pclass == CLASS_BLUE_MAGE)
 
 /*
  * Information about the player's "magic"
@@ -36,10 +13,7 @@
  * Note that a player with a "spell_book" of "zero" is illiterate.
  */
 
-typedef struct player_magic player_magic;
-
-struct player_magic
-{
+typedef struct player_magic {
        tval_type spell_book; /* Tval of spell books (if any) */
        int spell_xtra;         /* Something for later */
 
@@ -50,7 +24,7 @@ struct player_magic
        int spell_weight;               /* Weight that hurts spells */
 
        magic_type info[MAX_MAGIC][32];    /* The available spells */
-};
+} player_magic;
 
 extern player_magic *m_info;
 extern const player_magic *mp_ptr;
@@ -92,11 +66,13 @@ struct player_class
        s16b c_exp;                     /* Class experience factor */
 
        byte pet_upkeep_div; /* Pet upkeep divider */
+
+    int num;
+    int wgt;
+    int mul;
 };
 
 extern const player_class *cp_ptr;
 extern const player_class class_info[MAX_CLASS];
 
-extern const s32b realm_choices1[];
-extern const s32b realm_choices2[];
 extern const concptr player_title[MAX_CLASS][10];