X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=da08f8f270ba8793ceb26fea5aa0e5e8b8477dc2;hb=9a44855a30a336d0a1900a21ddf15fbbbe05407d;hp=f7a27be41970aa34490efae5a6dec6f72ab4c983;hpb=08b50e3e627781f9c4fe4b553152e0bad712e804;p=hengband%2Fhengband.git

diff --git a/src/externs.h b/src/externs.h
index f7a27be41..da08f8f27 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -258,10 +258,10 @@ extern u32b message__head;
 extern u32b message__tail;
 extern u32b *message__ptr;
 extern char *message__buf;
-extern u32b option_flag[8];
-extern u32b option_mask[8];
-extern u32b window_flag[8];
-extern u32b window_mask[8];
+extern BIT_FLAGS option_flag[8];
+extern BIT_FLAGS option_mask[8];
+extern BIT_FLAGS window_flag[8];
+extern BIT_FLAGS window_mask[8];
 extern term *angband_term[8];
 extern const char angband_term_name[8][16];
 extern byte angband_color_table[256][4];
@@ -517,7 +517,7 @@ extern void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION
 extern void health_track(MONSTER_IDX m_idx);
 extern void monster_race_track(MONRACE_IDX r_idx);
 extern void object_kind_track(KIND_OBJECT_IDX k_idx);
-extern void disturb(int stop_search, int flush_output);
+extern void disturb(bool stop_search, bool flush_output);
 extern void glow_deep_lava_and_bldg(void);
 extern bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, POSITION y, POSITION x, BIT_FLAGS mode);
 extern bool cave_player_teleportable_bold(POSITION y, POSITION x, BIT_FLAGS mode);
@@ -532,7 +532,7 @@ extern void carry(bool pickup);
 extern bool pattern_seq(POSITION c_y, POSITION c_x, POSITION n_y, POSITION n_x);
 extern bool player_can_enter(s16b feature, u16b mode);
 extern bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode);
-extern bool trap_can_be_ignored(int feat);
+extern bool trap_can_be_ignored(FEAT_IDX feat);
 extern void move_player(DIRECTION dir, bool do_pickup, bool break_trap);
 extern void run_step(DIRECTION dir);
 #ifdef TRAVEL
@@ -1049,26 +1049,13 @@ extern bool bless_weapon(void);
 extern bool pulish_shield(void);
 extern bool potion_smash_effect(MONSTER_IDX who, POSITION y, POSITION x, KIND_OBJECT_IDX k_idx);
 extern void display_spell_list(void);
-extern s16b experience_of_spell(int spell, int realm);
-extern int mod_need_mana(int need_mana, int spell, int realm);
+extern EXP experience_of_spell(SPELL_IDX spell, REALM_IDX use_realm);
+extern MANA_POINT mod_need_mana(MANA_POINT need_mana, SPELL_IDX spell, REALM_IDX realm);
 extern PERCENTAGE mod_spell_chance_1(PERCENTAGE chance);
 extern PERCENTAGE mod_spell_chance_2(PERCENTAGE chance);
 extern PERCENTAGE spell_chance(SPELL_IDX spell, REALM_IDX realm);
 extern bool spell_okay(int spell, bool learned, bool study_pray, int realm);
 extern void print_spells(SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, REALM_IDX realm);
-extern bool hates_acid(object_type *o_ptr);
-extern bool hates_elec(object_type *o_ptr);
-extern bool hates_fire(object_type *o_ptr);
-extern bool hates_cold(object_type *o_ptr);
-extern int set_acid_destroy(object_type *o_ptr);
-extern int set_elec_destroy(object_type *o_ptr);
-extern int set_fire_destroy(object_type *o_ptr);
-extern int set_cold_destroy(object_type *o_ptr);
-extern int inven_damage(inven_func typ, int perc);
-extern int acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura);
-extern int elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura);
-extern int fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura);
-extern int cold_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura);
 extern bool rustproof(void);
 extern bool curse_armor(void);
 extern bool curse_weapon_object(bool force, object_type *o_ptr);
@@ -1366,7 +1353,7 @@ extern void bolt(MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int d
 extern void breath(POSITION y, POSITION x, MONSTER_IDX m_idx, EFFECT_ID typ, int dam_hp, POSITION rad, bool breath, int monspell, int target_type);
 
 /* mspells2.c */
-extern void get_project_point(int sy, int sx, int *ty, int *tx, BIT_FLAGS flg);
+extern void get_project_point(POSITION sy, POSITION sx, POSITION *ty, POSITION *tx, BIT_FLAGS flg);
 extern bool monst_spell_monst(MONSTER_IDX m_idx);
 
 /* mspells3.c */
@@ -1442,35 +1429,23 @@ extern void fsetfileinfo(cptr path, u32b fcreator, u32b ftype);
 /* extern int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, ...); */
 #endif
 
-
 /* util.c */
 extern void repeat_push(COMMAND_CODE what);
 extern bool repeat_pull(COMMAND_CODE *what);
 extern void repeat_check(void);
 
-#ifdef ALLOW_EASY_OPEN /* TNB */
-
 /* variable.c */
 extern bool easy_open;
 
 /* cmd2.c */
 extern bool easy_open_door(POSITION y, POSITION x);
 
-#endif /* ALLOW_EASY_OPEN -- TNB */
-
-#ifdef ALLOW_EASY_DISARM /* TNB */
-
 /* variable.c */
 extern bool easy_disarm;
 
 /* cmd2.c */
 extern bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir);
 
-#endif /* ALLOW_EASY_DISARM -- TNB */
-
-
-#ifdef ALLOW_EASY_FLOOR /* TNB */
-
 /* object1.c */
 extern ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode);
 extern COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_LEN *min_width);
@@ -1480,8 +1455,6 @@ extern void py_pickup_floor(bool pickup);
 /* variable.c */
 extern bool easy_floor;
 
-#endif /* ALLOW_EASY_FLOOR -- TNB */
-
 /* obj_kind.c */
 extern bool object_is_potion(object_type *o_ptr);
 extern bool object_is_shoukinkubi(object_type *o_ptr);