X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Ftypes.h;h=aef5e97e22ba3b4c09f748a9332d1a0375d0de20;hb=6d340e461d95ac600bdf07d8e3d5ac1196298837;hp=eece8f739444f4086e2b0d45d5e4c17888cfe89c;hpb=3720b090721fa31d56022c3f99465563d55aae3c;p=hengband%2Fhengband.git

diff --git a/src/types.h b/src/types.h
index eece8f739..aef5e97e2 100644
--- a/src/types.h
+++ b/src/types.h
@@ -80,7 +80,7 @@ struct feature_type
 	feature_state state[MAX_FEAT_STATES]; /*!< feature_state テーブル */
 
 	byte subtype;  /*!< 副特性値 */
-	byte power;    /*!< 地形強度 */
+	FEAT_POWER power;    /*!< 地形強度 */
 
 	SYMBOL_COLOR d_attr[F_LIT_MAX];   /*!< デフォルトの地形シンボルカラー / Default feature attribute */
 	SYMBOL_CODE d_char[F_LIT_MAX];   /*!< デフォルトの地形シンボルアルファベット / Default feature character */
@@ -168,29 +168,30 @@ struct artifact_type
 	STR_OFFSET name;			/*!< アーティファクト名(headerオフセット参照) / Name (offset) */
 	STR_OFFSET text;			/*!< アーティファクト解説(headerオフセット参照) / Text (offset) */
 
-	byte tval;			/*!< ベースアイテム大項目ID / Artifact type */
-	byte sval;			/*!< ベースアイテム小項目ID / Artifact sub type */
+	OBJECT_TYPE_VALUE tval;		/*!< ベースアイテム大項目ID / Artifact type */
+	OBJECT_SUBTYPE_VALUE sval;	/*!< ベースアイテム小項目ID / Artifact sub type */
 
-	s16b pval;			/*!< pval修正値 / Artifact extra info */
+	PARAMETER_VALUE pval;	/*!< pval修正値 / Artifact extra info */
 
-	s16b to_h;			/*!< 命中ボーナス値 /  Bonus to hit */
-	s16b to_d;			/*!< ダメージボーナス値 / Bonus to damage */
-	s16b to_a;			/*!< ACボーナス値 / Bonus to armor */
+	HIT_PROB to_h;			/*!< 命中ボーナス値 /  Bonus to hit */
+	HIT_POINT to_d;		/*!< ダメージボーナス値 / Bonus to damage */
+	ARMOUR_CLASS to_a;			/*!< ACボーナス値 / Bonus to armor */
 
-	s16b ac;			/*!< 上書きベースAC値 / Base armor */
+	ARMOUR_CLASS ac;			/*!< 上書きベースAC値 / Base armor */
 
-	byte dd, ds;		/*!< ダイス値 / Damage when hits */
+	DICE_NUMBER dd;
+	DICE_SID ds;	/*!< ダイス値 / Damage when hits */
 
-	s16b weight;		/*!< 重量 / Weight */
+	WEIGHT weight;		/*!< 重量 / Weight */
 
-	s32b cost;			/*!< 基本価格 / Artifact "cost" */
+	PRICE cost;			/*!< 基本価格 / Artifact "cost" */
 
-	u32b flags[TR_FLAG_SIZE];       /*! アイテムフラグ / Artifact Flags */
+	BIT_FLAGS flags[TR_FLAG_SIZE];       /*! アイテムフラグ / Artifact Flags */
 
-	u32b gen_flags;		/*! アイテム生成フラグ / flags for generate */
+	BIT_FLAGS gen_flags;		/*! アイテム生成フラグ / flags for generate */
 
-	byte level;			/*! 基本生成階 / Artifact level */
-	byte rarity;		/*! レアリティ / Artifact rarity */
+	DEPTH level;		/*! 基本生成階 / Artifact level */
+	RARITY rarity;		/*! レアリティ / Artifact rarity */
 
 	byte cur_num;		/*! 現在の生成数 / Number created (0 or 1) */
 	byte max_num;		/*! (未使用)最大生成数 / Unused (should be "1") */
@@ -218,17 +219,16 @@ struct ego_item_type
 	DEPTH level;			/* Minimum level */
 	RARITY rarity;		/* Object rarity */
 
-	byte max_to_h;		/* Maximum to-hit bonus */
-	byte max_to_d;		/* Maximum to-dam bonus */
-	byte max_to_a;		/* Maximum to-ac bonus */
+	HIT_PROB max_to_h;		/* Maximum to-hit bonus */
+	HIT_POINT max_to_d;		/* Maximum to-dam bonus */
+	ARMOUR_CLASS max_to_a;		/* Maximum to-ac bonus */
 
 	PARAMETER_VALUE max_pval;		/* Maximum pval */
 
-	s32b cost;			/* Ego-item "cost" */
-
-	u32b flags[TR_FLAG_SIZE];	/* Ego-Item Flags */
+	PRICE cost;			/* Ego-item "cost" */
 
-	u32b gen_flags;		/* flags for generate */
+	BIT_FLAGS flags[TR_FLAG_SIZE];	/* Ego-Item Flags */
+	BIT_FLAGS gen_flags;		/* flags for generate */
 
 	IDX act_idx;		/* Activative ability index */
 };
@@ -251,8 +251,8 @@ struct monster_blow
 {
 	byte method;
 	byte effect;
-	byte d_dice;
-	byte d_side;
+	DICE_NUMBER d_dice;
+	DICE_SID d_side;
 };
 
 
@@ -305,39 +305,39 @@ struct monster_race
 	byte aaf;				/*!< 感知範囲(1-100スクエア) / Area affect radius (1-100) */
 	SPEED speed;				/*!< 加速(110で+0) / Speed (normally 110) */
 
-	s32b mexp;				/*!< 殺害時基本経験値 / Exp value for kill */
+	EXP mexp;				/*!< 殺害時基本経験値 / Exp value for kill */
 
 	s16b extra;				/*!< 未使用 /  Unused (for now) */
 
 	byte freq_spell;		/*!< 魔法＆特殊能力仕様頻度(1/n) /  Spell frequency */
 
-	u32b flags1;			/* Flags 1 (general) */
-	u32b flags2;			/* Flags 2 (abilities) */
-	u32b flags3;			/* Flags 3 (race/resist) */
-	u32b flags4;			/* Flags 4 (inate/breath) */
-	u32b flags7;			/* Flags 7 (movement related abilities) */
-	u32b flags8;			/* Flags 8 (wilderness info) */
-	u32b flags9;			/* Flags 9 (drops info) */
-	u32b flagsr;			/* Flags R (resistances info) */
+	BIT_FLAGS flags1;			/* Flags 1 (general) */
+	BIT_FLAGS flags2;			/* Flags 2 (abilities) */
+	BIT_FLAGS flags3;			/* Flags 3 (race/resist) */
+	BIT_FLAGS flags4;			/* Flags 4 (inate/breath) */
+	BIT_FLAGS flags7;			/* Flags 7 (movement related abilities) */
+	BIT_FLAGS flags8;			/* Flags 8 (wilderness info) */
+	BIT_FLAGS flags9;			/* Flags 9 (drops info) */
+	BIT_FLAGS flagsr;			/* Flags R (resistances info) */
 
-	u32b a_ability_flags1;	/* Activate Ability Flags 5 (normal spells) */
-	u32b a_ability_flags2;	/* Activate Ability Flags 6 (special spells) */
-	u32b a_ability_flags3;	/* Activate Ability Flags 7 (implementing) */
-	u32b a_ability_flags4;	/* Activate Ability Flags 8 (implementing) */
+	BIT_FLAGS a_ability_flags1;	/* Activate Ability Flags 5 (normal spells) */
+	BIT_FLAGS a_ability_flags2;	/* Activate Ability Flags 6 (special spells) */
+	BIT_FLAGS a_ability_flags3;	/* Activate Ability Flags 7 (implementing) */
+	BIT_FLAGS a_ability_flags4;	/* Activate Ability Flags 8 (implementing) */
 
 	monster_blow blow[4];	/* Up to four blows per round */
-	IDX reinforce_id[6];
+	MONRACE_IDX reinforce_id[6];
 	DICE_NUMBER reinforce_dd[6];
 	DICE_SID reinforce_ds[6];
 
-	IDX artifact_id[4];	/* 特定アーティファクトドロップID */
+	ARTIFACT_IDX artifact_id[4];	/* 特定アーティファクトドロップID */
 	RARITY artifact_rarity[4];	/* 特定アーティファクトレア度 */
 	PERCENTAGE artifact_percent[4]; /* 特定アーティファクトドロップ率 */
 
 	PERCENTAGE arena_ratio;		/* アリーナの評価修正値(%基準 / 0=100%) / Arena */
 
-	IDX next_r_idx;
-	u32b next_exp;
+	MONRACE_IDX next_r_idx;
+	EXP next_exp;
 
 	DEPTH level;			/* Level of creature */
 	RARITY rarity;			/* Rarity of creature */
@@ -534,11 +534,11 @@ struct object_type
 	IDX name1;			/* Artifact type, if any */
 	IDX name2;			/* Ego-Item type, if any */
 
-	byte xtra1;			/* Extra info type (now unused) */
-	byte xtra2;			/* Extra info activation index */
-	byte xtra3;			/* Extra info for weaponsmith */
-	s16b xtra4;			/* Extra info fuel or captured monster's current HP */
-	s16b xtra5;			/* Extra info captured monster's max HP */
+	XTRA8 xtra1;			/* Extra info type (now unused) */
+	XTRA8 xtra2;			/* Extra info activation index */
+	XTRA8 xtra3;			/* Extra info for weaponsmith */
+	XTRA16 xtra4;			/* Extra info fuel or captured monster's current HP */
+	XTRA16 xtra5;			/* Extra info captured monster's max HP */
 
 	HIT_PROB to_h;			/* Plusses to hit */
 	HIT_POINT to_d;			/* Plusses to damage */
@@ -606,18 +606,18 @@ struct monster_type
 
 	bool ml;		/* Monster is "visible" */
 
-	IDX hold_o_idx;	/* Object being held (if any) */
+	OBJECT_IDX hold_o_idx;	/* Object being held (if any) */
 
 	POSITION target_y;		/* Can attack !los player */
 	POSITION target_x;		/* Can attack !los player */
 
-	u16b nickname;		/* Monster's Nickname */
+	STR_OFFSET nickname;		/* Monster's Nickname */
 
-	u32b exp;
+	EXP exp;
 
-	u32b smart;			/* Field for "smart_learn" */
+	BIT_FLAGS smart;			/* Field for "smart_learn" */
 
-	s16b parent_m_idx;
+	MONSTER_IDX parent_m_idx;
 };
 
 
@@ -635,12 +635,12 @@ typedef struct alloc_entry alloc_entry;
 
 struct alloc_entry
 {
-	s16b index;		/* The actual index */
+	IDX index;		/* The actual index */
 
-	byte level;		/* Base dungeon level */
-	byte prob1;		/* Probability, pass 1 */
-	byte prob2;		/* Probability, pass 2 */
-	byte prob3;		/* Probability, pass 3 */
+	DEPTH level;		/* Base dungeon level */
+	PROB prob1;		/* Probability, pass 1 */
+	PROB prob2;		/* Probability, pass 2 */
+	PROB prob3;		/* Probability, pass 3 */
 
 	u16b total;		/* Unused for now */
 };
@@ -776,10 +776,10 @@ typedef struct magic_type magic_type;
 
 struct magic_type
 {
-	byte slevel;		/* Required level (to learn) */
-	byte smana;			/* Required mana (to cast) */
-	byte sfail;			/* Minimum chance of failure */
-	byte sexp;			/* Encoded experience bonus */
+	PLAYER_LEVEL slevel;	/* Required level (to learn) */
+	MANA_POINT smana;		/* Required mana (to cast) */
+	PERCENTAGE sfail;		/* Minimum chance of failure */
+	EXP sexp;				/* Encoded experience bonus */
 };
 
 
@@ -991,7 +991,7 @@ struct player_type
 	s16b town_num;			/* Current town number */
 	s16b arena_number;		/* monster number in arena -KMW- */
 	bool inside_arena;		/* Is character inside arena? */
-	IDX inside_quest;		/* Inside quest level */
+	QUEST_IDX inside_quest;		/* Inside quest level */
 	bool inside_battle;		/* Is character inside tougijou? */
 
 	POSITION wilderness_x;	/* Coordinates in the wilderness */
@@ -1080,14 +1080,14 @@ struct player_type
 	s16b virtues[8];
 	s16b vir_types[8];
 
-	s16b word_recall;	  /* Word of recall counter */
-	s16b alter_reality;	  /* Alter reality counter */
-	IDX recall_dungeon;      /* Dungeon set to be recalled */
+	TIME_EFFECT word_recall;	  /* Word of recall counter */
+	TIME_EFFECT alter_reality;	  /* Alter reality counter */
+	DUNGEON_IDX recall_dungeon;      /* Dungeon set to be recalled */
 
 	ENERGY energy_need;	  /* Energy needed for next move */
 	ENERGY enchant_energy_need;	  /* Energy needed for next upkeep effect	 */
 
-	s16b food;		  /* Current nutrition */
+	FEED food;		  /* Current nutrition */
 
 	BIT_FLAGS special_attack;	  /* Special attack capacity -LM- */
 	BIT_FLAGS special_defense;	  /* Special block capacity -LM- */
@@ -1108,13 +1108,13 @@ struct player_type
 	MAGIC_NUM1 magic_num1[108];     /*!< Array for non-spellbook type magic */
 	MAGIC_NUM2 magic_num2[108];     /*!< Flags for non-spellbook type magics */
 
-	s16b mane_spell[MAX_MANE];
-	s16b mane_dam[MAX_MANE];
+	SPELL_IDX mane_spell[MAX_MANE];
+	HIT_POINT mane_dam[MAX_MANE];
 	s16b mane_num;
 
 	s16b concent;      /* Sniper's concentration level */
 
-	s16b player_hp[PY_MAX_LEVEL];
+	HIT_POINT player_hp[PY_MAX_LEVEL];
 	char died_from[80];   	  /* What killed the player */
 	cptr last_message;        /* Last message on death or retirement */
 	char history[4][60];  	  /* Textual "history" for the Player */
@@ -1363,8 +1363,8 @@ struct birther
 	byte prace;        /* Race index */
 	byte pclass;       /* Class index */
 	byte pseikaku;     /* Seikaku index */
-	byte realm1;       /* First magic realm */
-	byte realm2;       /* Second magic realm */
+	REALM_IDX realm1;       /* First magic realm */
+	REALM_IDX realm2;       /* Second magic realm */
 
 	s16b age;
 	s16b ht;
@@ -1373,9 +1373,9 @@ struct birther
 
 	s32b au;
 
-	s16b stat_max[6];	/* Current "maximal" stat values */
-	s16b stat_max_max[6];	/* Maximal "maximal" stat values */
-	s16b player_hp[PY_MAX_LEVEL];
+	BASE_STATUS stat_max[6];	/* Current "maximal" stat values */
+	BASE_STATUS stat_max_max[6];	/* Maximal "maximal" stat values */
+	HIT_POINT player_hp[PY_MAX_LEVEL];
 
 	s16b chaos_patron;
 
@@ -1492,7 +1492,7 @@ struct wilderness_type
 	int         town;
 	int         road;
 	u32b        seed;
-	s16b        level;
+	DEPTH        level;
 	byte        entrance;
 };
 
@@ -1585,8 +1585,8 @@ struct high_score
 
 typedef struct
 {
-	s16b feat;    /* Feature tile */
-	byte percent; /* Chance of type */
+	FEAT_IDX feat;    /* Feature tile */
+	PERCENTAGE percent; /* Chance of type */
 }
 feat_prob;
 
@@ -1597,41 +1597,41 @@ struct dungeon_info_type {
 	STR_OFFSET name;		/* Name */
 	STR_OFFSET text;		/* Description */
 
-	byte dy;
-	byte dx;
+	POSITION dy;
+	POSITION dx;
 
 	feat_prob floor[DUNGEON_FEAT_PROB_NUM]; /* Floor probability */
 	feat_prob fill[DUNGEON_FEAT_PROB_NUM];  /* Cave wall probability */
-	s16b outer_wall;                        /* Outer wall tile */
-	s16b inner_wall;                        /* Inner wall tile */
-	s16b stream1;                           /* stream tile */
-	s16b stream2;                           /* stream tile */
-
-	s16b mindepth;         /* Minimal depth */
-	s16b maxdepth;         /* Maximal depth */
-	byte min_plev;         /* Minimal plev needed to enter -- it's an anti-cheating mesure */
-	s16b pit;
-	s16b nest;
+	FEAT_IDX outer_wall;                        /* Outer wall tile */
+	FEAT_IDX inner_wall;                        /* Inner wall tile */
+	FEAT_IDX stream1;                           /* stream tile */
+	FEAT_IDX stream2;                           /* stream tile */
+
+	DEPTH mindepth;         /* Minimal depth */
+	DEPTH maxdepth;         /* Maximal depth */
+	PLAYER_LEVEL min_plev;         /* Minimal plev needed to enter -- it's an anti-cheating mesure */
+	BIT_FLAGS16 pit;
+	BIT_FLAGS16 nest;
 	byte mode;		/* Mode of combinaison of the monster flags */
 
 	int min_m_alloc_level;	/* Minimal number of monsters per level */
 	int max_m_alloc_chance;	/* There is a 1/max_m_alloc_chance chance per round of creating a new monster */
 
-	u32b flags1;		/* Flags 1 */
+	BIT_FLAGS flags1;		/* Flags 1 */
 
-	u32b mflags1;		/* The monster flags that are allowed */
-	u32b mflags2;
-	u32b mflags3;
-	u32b mflags4;
-	u32b mflags7;
-	u32b mflags8;
-	u32b mflags9;
-	u32b mflagsr;
+	BIT_FLAGS mflags1;		/* The monster flags that are allowed */
+	BIT_FLAGS mflags2;
+	BIT_FLAGS mflags3;
+	BIT_FLAGS mflags4;
+	BIT_FLAGS mflags7;
+	BIT_FLAGS mflags8;
+	BIT_FLAGS mflags9;
+	BIT_FLAGS mflagsr;
 
-	u32b m_a_ability_flags1;
-	u32b m_a_ability_flags2;
-	u32b m_a_ability_flags3;
-	u32b m_a_ability_flags4;
+	BIT_FLAGS m_a_ability_flags1;
+	BIT_FLAGS m_a_ability_flags2;
+	BIT_FLAGS m_a_ability_flags3;
+	BIT_FLAGS m_a_ability_flags4;
 
 	char r_char[5];		/* Monster race allowed */
 	int final_object;	/* The object you'll find at the bottom */
@@ -1704,13 +1704,13 @@ typedef struct
  */
 typedef struct
 {
-	s16b open;
-	s16b broken;
-	s16b closed;
-	s16b locked[MAX_LJ_DOORS];
-	s16b num_locked;
-	s16b jammed[MAX_LJ_DOORS];
-	s16b num_jammed;
+	FEAT_IDX open;
+	FEAT_IDX broken;
+	FEAT_IDX closed;
+	FEAT_IDX locked[MAX_LJ_DOORS];
+	FEAT_IDX num_locked;
+	FEAT_IDX jammed[MAX_LJ_DOORS];
+	FEAT_IDX num_jammed;
 } door_type;