X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=c87224310d581191fb38822e95a716415f1f79b8;hb=cee5e8f2f28a7b602659f2de6aa1df5cdf7f8fbd;hp=41367a0dbd4cc1da63986d71fd96929300a609a2;hpb=c806c62e01f485b9d5a9a5a08a51b36921ff50c4;p=hengband%2Fhengband.git

diff --git a/src/externs.h b/src/externs.h
index 41367a0db..c87224310 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -39,88 +39,89 @@ extern int max_max_autopick;
 extern autopick_type *autopick_list;
 
 /* tables.c */
-extern s16b ddd[9];
-extern s16b ddx[10];
-extern s16b ddy[10];
-extern s16b ddx_ddd[9];
-extern s16b ddy_ddd[9];
-extern s16b cdd[8];
-extern s16b ddx_cdd[8];
-extern s16b ddy_cdd[8];
-extern char hexsym[16];
-extern char listsym[];
-extern cptr color_char;
-extern byte adj_mag_study[];
-extern byte adj_mag_mana[];
-extern byte adj_mag_fail[];
-extern byte adj_mag_stat[];
-extern byte adj_chr_gold[];
-extern byte adj_int_dev[];
-extern byte adj_wis_sav[];
-extern byte adj_dex_dis[];
-extern byte adj_int_dis[];
-extern byte adj_dex_ta[];
-extern byte adj_str_td[];
-extern byte adj_dex_th[];
-extern byte adj_str_th[];
-extern byte adj_str_wgt[];
-extern byte adj_str_hold[];
-extern byte adj_str_dig[];
-extern byte adj_str_blow[];
-extern byte adj_dex_blow[];
-extern byte adj_dex_safe[];
-extern byte adj_con_fix[];
-extern byte adj_con_mhp[];
-extern byte adj_chr_chm[];
-extern byte blows_table[12][12];
-extern arena_type arena_info[MAX_ARENA_MONS + 2];
-extern owner_type owners[MAX_STORES][MAX_OWNERS];
-extern byte extract_energy[200];
-extern s32b player_exp[PY_MAX_LEVEL];
-extern s32b player_exp_a[PY_MAX_LEVEL];
-extern player_sex sex_info[MAX_SEXES];
-extern player_race race_info[MAX_RACES];
-extern player_class class_info[MAX_CLASS];
-extern magic_type technic_info[NUM_TECHNIC][32];
-extern player_seikaku seikaku_info[MAX_SEIKAKU];
-extern player_race mimic_info[];
-extern u32b fake_spell_flags[4];
-extern s32b realm_choices1[];
-extern s32b realm_choices2[];
-extern cptr realm_names[];
+extern const s16b ddd[9];
+extern const s16b ddx[10];
+extern const s16b ddy[10];
+extern const s16b ddx_ddd[9];
+extern const s16b ddy_ddd[9];
+extern const s16b cdd[8];
+extern const s16b ddx_cdd[8];
+extern const s16b ddy_cdd[8];
+extern const char hexsym[16];
+extern const char listsym[];
+extern const cptr color_char;
+extern const byte adj_mag_study[];
+extern const byte adj_mag_mana[];
+extern const byte adj_mag_fail[];
+extern const byte adj_mag_stat[];
+extern const byte adj_chr_gold[];
+extern const byte adj_int_dev[];
+extern const byte adj_wis_sav[];
+extern const byte adj_dex_dis[];
+extern const byte adj_int_dis[];
+extern const byte adj_dex_ta[];
+extern const byte adj_str_td[];
+extern const byte adj_dex_th[];
+extern const byte adj_str_th[];
+extern const byte adj_str_wgt[];
+extern const byte adj_str_hold[];
+extern const byte adj_str_dig[];
+extern const byte adj_str_blow[];
+extern const byte adj_dex_blow[];
+extern const byte adj_dex_safe[];
+extern const byte adj_con_fix[];
+extern const byte adj_con_mhp[];
+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 owner_type owners[MAX_STORES][MAX_OWNERS];
+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];
+extern const magic_type technic_info[NUM_TECHNIC][32];
+extern const player_seikaku seikaku_info[MAX_SEIKAKU];
+extern const player_race mimic_info[];
+extern const u32b fake_spell_flags[4];
+extern const s32b realm_choices1[];
+extern const s32b realm_choices2[];
+extern const cptr realm_names[];
 #ifdef JP
-extern cptr E_realm_names[];
+extern const cptr E_realm_names[];
 #endif
-extern cptr spell_names[VALID_REALM][32];
-extern int chest_traps[64];
-extern cptr player_title[MAX_CLASS][PY_MAX_LEVEL/5];
-extern cptr color_names[16];
-extern cptr stat_names[6];
-extern cptr stat_names_reduced[6];
-extern cptr window_flag_desc[32];
-extern option_type option_info[];
-extern cptr chaos_patrons[MAX_PATRON];
-extern int chaos_stats[MAX_PATRON];
-extern int chaos_rewards[MAX_PATRON][20];
-extern martial_arts ma_blows[MAX_MA];
-extern int monk_ave_damage[PY_MAX_LEVEL+1][3];
-extern cptr game_inscriptions[];
-extern kamae kamae_shurui[MAX_KAMAE];
-extern kamae kata_shurui[MAX_KATA];
-extern cptr exp_level_str[5];
-extern s16b conv_terrain2feat[MAX_WILDERNESS];
-extern cptr silly_attacks[MAX_SILLY_ATTACK];
+extern const cptr spell_names[VALID_REALM][32];
+extern const int chest_traps[64];
+extern const cptr player_title[MAX_CLASS][PY_MAX_LEVEL/5];
+extern const cptr color_names[16];
+extern const cptr stat_names[6];
+extern const cptr stat_names_reduced[6];
+extern const cptr window_flag_desc[32];
+extern const option_type option_info[];
+extern const cptr chaos_patrons[MAX_PATRON];
+extern const int chaos_stats[MAX_PATRON];
+extern const int chaos_rewards[MAX_PATRON][20];
+extern const martial_arts ma_blows[MAX_MA];
+extern const int monk_ave_damage[PY_MAX_LEVEL+1][3];
+extern const cptr game_inscriptions[];
+extern const kamae kamae_shurui[MAX_KAMAE];
+extern const kamae kata_shurui[MAX_KATA];
+extern const cptr exp_level_str[5];
+extern const cptr silly_attacks[MAX_SILLY_ATTACK];
 #ifdef JP
-extern cptr silly_attacks2[MAX_SILLY_ATTACK];
+extern const cptr silly_attacks2[MAX_SILLY_ATTACK];
 #endif
-extern monster_power monster_powers[MAX_MONSPELLS];
-extern cptr monster_powers_short[MAX_MONSPELLS];
-extern cptr ident_info[];
-extern mbe_info_type mbe_info[];
-extern byte feature_action_flags[FF_FLAG_MAX];
+extern const monster_power monster_powers[MAX_MONSPELLS];
+extern const cptr monster_powers_short[MAX_MONSPELLS];
+extern const cptr ident_info[];
+extern const mbe_info_type mbe_info[];
+extern const byte feature_action_flags[FF_FLAG_MAX];
+extern const dragonbreath_type dragonbreath_info[];
+extern const activation_type activation_info[];
 
 /* variable.c */
-extern cptr copyright[5];
+extern const cptr copyright[5];
 extern byte h_ver_major;
 extern byte h_ver_minor;
 extern byte h_ver_patch;
@@ -147,6 +148,7 @@ extern bool character_loaded;
 extern bool character_saved;
 extern bool character_icky;
 extern bool character_xtra;
+extern bool creating_savefile;
 extern u32b seed_flavor;
 extern u32b seed_town;
 extern s16b command_cmd;
@@ -169,7 +171,9 @@ extern s16b object_level;
 extern s16b monster_level;
 extern s16b base_level;
 extern s32b turn;
+extern s32b turn_limit;
 extern s32b dungeon_turn;
+extern s32b dungeon_turn_limit;
 extern s32b old_turn;
 extern s32b old_battle;
 extern bool use_sound;
@@ -180,6 +184,7 @@ extern bool inkey_base;
 extern bool inkey_xtra;
 extern bool inkey_scan;
 extern bool inkey_flag;
+extern bool get_com_no_macros;
 extern s16b coin_type;
 extern bool opening_chest;
 extern bool shimmer_monsters;
@@ -196,7 +201,6 @@ extern s16b m_cnt;
 extern s16b hack_m_idx;
 extern s16b hack_m_idx_ii;
 extern int total_friends;
-extern s32b total_friend_levels;
 extern s32b friend_align;
 extern int leaving_quest;
 extern bool reinit_wilderness;
@@ -278,6 +282,9 @@ extern bool abbrev_extra;	/* Describe obj's extra resistances by abbreviation */
 extern bool abbrev_all;	/* Describe obj's all resistances by abbreviation */
 extern bool exp_need;	/* Show the experience needed for next level */
 extern bool ignore_unview;	/* Ignore whenever any monster does */
+extern bool show_ammo_detail;	/* Show Description of ammo damage */
+extern bool show_ammo_no_crit;	/* Show No-crit damage of ammo */
+extern bool show_ammo_crit_ratio;	/* Show critical ratio of ammo */
 
 
 /*** Game-Play Options ***/
@@ -435,15 +442,17 @@ extern u32b option_mask[8];
 extern u32b window_flag[8];
 extern u32b window_mask[8];
 extern term *angband_term[8];
-extern char angband_term_name[8][16];
+extern const char angband_term_name[8][16];
 extern byte angband_color_table[256][4];
-extern char angband_sound_name[SOUND_MAX][16];
+extern const cptr angband_sound_name[SOUND_MAX];
 extern cave_type *cave[MAX_HGT];
 extern saved_floor_type saved_floors[MAX_SAVED_FLOORS];
 extern s16b max_floor_id;
 extern u32b saved_floor_file_sign;
 extern object_type *o_list;
 extern monster_type *m_list;
+extern s16b *mproc_list[MAX_MTIMED];
+extern s16b mproc_max[MAX_MTIMED];
 extern u16b max_towns;
 extern town_type *town;
 extern object_type *inventory;
@@ -457,11 +466,11 @@ extern byte tval_to_attr[128];
 extern char tval_to_char[128];
 extern cptr keymap_act[KEYMAP_MODES][256];
 extern player_type *p_ptr;
-extern player_sex *sp_ptr;
-extern player_race *rp_ptr;
-extern player_class *cp_ptr;
-extern player_seikaku *ap_ptr;
-extern player_magic *mp_ptr;
+extern const player_sex *sp_ptr;
+extern const player_race *rp_ptr;
+extern const player_class *cp_ptr;
+extern const player_seikaku *ap_ptr;
+extern const player_magic *mp_ptr;
 extern birther previous_char;
 extern vault_type *v_info;
 extern char *v_name;
@@ -551,7 +560,6 @@ extern int pet_t_m_idx;
 extern int riding_t_m_idx;
 extern s16b kubi_r_idx[MAX_KUBI];
 extern s16b today_mon;
-extern monster_type party_mon[MAX_PARTY_MON];
 extern bool write_level;
 extern u32b playtime;
 extern u32b start_time;
@@ -562,6 +570,52 @@ extern bool mon_fight;
 extern bool ambush_flag;
 extern bool generate_encounter;
 extern cptr screen_dump;
+
+/*** Terrain feature variables ***/
+extern s16b feat_none;
+extern s16b feat_floor;
+extern s16b feat_glyph;
+extern s16b feat_explosive_rune;
+extern s16b feat_mirror;
+extern door_type feat_door[MAX_DOOR_TYPES];
+extern s16b feat_up_stair;
+extern s16b feat_down_stair;
+extern s16b feat_entrance;
+extern s16b feat_trap_open;
+extern s16b feat_trap_armageddon;
+extern s16b feat_trap_piranha;
+extern s16b feat_rubble;
+extern s16b feat_magma_vein;
+extern s16b feat_quartz_vein;
+extern s16b feat_granite;
+extern s16b feat_permanent;
+extern s16b feat_glass_floor;
+extern s16b feat_glass_wall;
+extern s16b feat_permanent_glass_wall;
+extern s16b feat_pattern_start;
+extern s16b feat_pattern_1;
+extern s16b feat_pattern_2;
+extern s16b feat_pattern_3;
+extern s16b feat_pattern_4;
+extern s16b feat_pattern_end;
+extern s16b feat_pattern_old;
+extern s16b feat_pattern_exit;
+extern s16b feat_pattern_corrupted;
+extern s16b feat_black_market;
+extern s16b feat_town;
+extern s16b feat_deep_water;
+extern s16b feat_shallow_water;
+extern s16b feat_deep_lava;
+extern s16b feat_shallow_lava;
+extern s16b feat_dirt;
+extern s16b feat_grass;
+extern s16b feat_flower;
+extern s16b feat_brake;
+extern s16b feat_tree;
+extern s16b feat_mountain;
+extern s16b feat_swamp;
+extern s16b feat_undetected;
+
 extern byte dungeon_type;
 extern s16b *max_dlv;
 extern s16b feat_wall_outer;
@@ -602,7 +656,6 @@ extern bool los(int y1, int x1, int y2, int x2);
 extern void update_local_illumination(int y, int x);
 extern bool player_can_see_bold(int y, int x);
 extern bool cave_valid_bold(int y, int x);
-extern bool cave_valid_grid(cave_type *c_ptr);
 extern bool no_lite(void);
 extern void apply_default_feat_lighting(byte f_attr[F_LIT_MAX], byte f_char[F_LIT_MAX]);
 extern void map_info(int y, int x, byte *ap, char *cp, byte *tap, char *tcp);
@@ -646,9 +699,9 @@ extern void disturb(int stop_search, int flush_output);
 extern void glow_deep_lava_and_bldg(void);
 
 /* cmd1.c */
-extern bool test_hit_fire(int chance, int ac, int vis);
+extern bool test_hit_fire(int chance, monster_type *m_ptr, int vis, char* o_name);
 extern bool test_hit_norm(int chance, int ac, int vis);
-extern s16b critical_shot(int weight, int plus, int dam);
+extern s16b critical_shot(int weight, int plus_ammo, int plus_bow, int dam);
 extern s16b critical_norm(int weight, int plus, int dam, s16b meichuu, int mode);
 extern s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bool thrown);
 extern void search(void);
@@ -661,8 +714,13 @@ extern bool move_player_effect(int ny, int nx, u32b mpe_mode);
 extern bool trap_can_be_ignored(int feat);
 extern void move_player(int dir, bool do_pickup, bool break_trap);
 extern void run_step(int dir);
+#ifdef TRAVEL
+extern void travel_step(void);
+#endif
 
 /* cmd2.c */
+extern void forget_travel_flow(void);
+extern bool confirm_leave_level(bool down_stair);
 extern void do_cmd_go_up(void);
 extern void do_cmd_go_down(void);
 extern void do_cmd_search(void);
@@ -681,6 +739,9 @@ extern void do_cmd_fire(void);
 extern void do_cmd_fire_aux(int item, object_type *j_ptr);
 extern void do_cmd_throw(void);
 extern bool do_cmd_throw_aux(int mult, bool boomerang, int shuriken);
+#ifdef TRAVEL
+extern void do_cmd_travel(void);
+#endif
 
 /* cmd3.c */
 extern void do_cmd_inven(void);
@@ -738,9 +799,9 @@ extern cptr spell_category_name(int tval);
 extern void do_cmd_browse(void);
 extern void do_cmd_study(void);
 extern void do_cmd_cast(void);
-extern void do_cmd_pray(void);
 extern bool rakuba(int dam, bool force);
 extern bool do_riding(bool force);
+extern void check_pets_num_and_align(monster_type *m_ptr, bool inc);
 extern int calculate_upkeep(void);
 extern void do_cmd_pet_dismiss(void);
 extern void do_cmd_pet(void);
@@ -757,7 +818,7 @@ extern void do_cmd_rerate_aux(void);
 extern void do_cmd_rerate(bool display);
 extern void ring_of_power(int dir);
 extern void do_cmd_use(void);
-extern void do_cmd_magic_eater(bool only_browse);
+extern bool do_cmd_magic_eater(bool only_browse, bool powerful);
 
 /* do-spell.c */
 extern void stop_singing(void);
@@ -765,6 +826,7 @@ extern cptr do_spell(int realm, int spell, int mode);
 
 /* dungeon.c */
 extern void leave_quest_check(void);
+extern void leave_tower_check(void);
 extern void extract_option_vars(void);
 extern void determine_bounty_uniques(void);
 extern void determine_today_mon(bool conv_old);
@@ -773,6 +835,7 @@ extern bool psychometry(void);
 extern void leave_level(int level);
 extern void enter_level(int level);
 extern s32b turn_real(s32b hoge);
+extern void prevent_turn_overflow(void);
 
 
 /* files.c */
@@ -783,7 +846,7 @@ extern void display_player(int mode);
 extern errr make_character_dump(FILE *fff);
 extern errr file_character(cptr name);
 extern errr process_pref_file_command(char *buf);
-extern cptr process_pref_file_expr(cptr *sp, char *fp);
+extern cptr process_pref_file_expr(char **sp, char *fp);
 extern errr process_pref_file(cptr name);
 extern errr process_autopick_file(cptr name);
 extern errr process_histpref_file(cptr name);
@@ -814,8 +877,11 @@ extern errr counts_write(int where, u32b count);
 extern u32b counts_read(int where);
 
 /* flavor.c */
+extern bool object_is_quest_target(object_type *o_ptr);
 extern void get_table_name_aux(char *out_string);
 extern void get_table_name(char *out_string);
+extern void get_table_sindarin_aux(char *out_string);
+extern void get_table_sindarin(char *out_string);
 extern void flavor_init(void);
 extern char *object_desc_kosuu(char *t, object_type *o_ptr);
 extern void object_desc(char *buf, object_type *o_ptr, u32b mode);
@@ -832,8 +898,8 @@ extern void change_floor(void);
 extern void stair_creation(void);
 
 /* generate.c */
-extern void place_closed_door(int y, int x);
-extern void place_quest_monsters(void);
+extern bool place_quest_monsters(void);
+extern void wipe_generate_cave_flags(void);
 extern void clear_cave(void);
 extern void generate_cave(void);
 
@@ -847,6 +913,7 @@ extern void init_file_paths(char *path);
 extern cptr err_str[PARSE_ERROR_MAX];
 extern errr init_v_info(void);
 extern errr init_buildings(void);
+extern s16b f_tag_to_index_in_init(cptr str);
 extern void init_angband(void);
 extern cptr get_check_sum(void);
 
@@ -857,8 +924,18 @@ extern bool load_floor(saved_floor_type *sf_ptr, u32b mode);
 /* melee1.c */
 /* melee2.c */
 extern bool make_attack_normal(int m_idx);
-extern bool make_attack_spell(int m_idx);
 extern void process_monsters(void);
+extern int get_mproc_idx(int m_idx, int mproc_type);
+extern void mproc_init(void);
+extern bool set_monster_csleep(int m_idx, int v);
+extern bool set_monster_fast(int m_idx, int v);
+extern bool set_monster_slow(int m_idx, int v);
+extern bool set_monster_stunned(int m_idx, int v);
+extern bool set_monster_confused(int m_idx, int v);
+extern bool set_monster_monfear(int m_idx, int v);
+extern bool set_monster_invulner(int m_idx, int v, bool energy_need);
+extern void process_monsters_mtimed(int mtimed_idx);
+extern void dispel_monster_status(int m_idx);
 extern u32b get_curse(int power, object_type *o_ptr);
 extern void curse_equipment(int chance, int heavy_chance);
 extern void mon_take_hit_mon(int m_idx, int dam, bool *fear, cptr note, int who);
@@ -910,7 +987,7 @@ extern void update_monsters(bool full);
 extern bool place_monster_aux(int who, int y, int x, int r_idx, u32b mode);
 extern bool place_monster(int y, int x, u32b mode);
 extern bool alloc_horde(int y, int x);
-extern bool alloc_guardian(void);
+extern bool alloc_guardian(bool def_val);
 extern bool alloc_monster(int dis, u32b mode);
 extern bool summon_specific(int who, int y1, int x1, int lev, int type, u32b mode);
 extern bool summon_named_creature (int who, int oy, int ox, int r_idx, u32b mode);
@@ -928,7 +1005,7 @@ extern void reset_visuals(void);
 extern void object_flags(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE]);
 extern void object_flags_known(object_type *o_ptr, u32b flgs[TR_FLAG_SIZE]);
 extern cptr item_activation(object_type *o_ptr);
-extern bool screen_object(object_type *o_ptr, bool real);
+extern bool screen_object(object_type *o_ptr, u32b mode);
 extern char index_to_label(int i);
 extern s16b label_to_inven(int c);
 extern s16b label_to_equip(int c);
@@ -961,6 +1038,7 @@ extern s32b object_value_real(object_type *o_ptr);
 extern bool can_player_destroy_object(object_type *o_ptr);
 extern void distribute_charges(object_type *o_ptr, object_type *q_ptr, int amt);
 extern void reduce_charges(object_type *o_ptr, int amt);
+extern int object_similar_part(object_type *o_ptr, object_type *j_ptr);
 extern bool object_similar(object_type *o_ptr, object_type *j_ptr);
 extern void object_absorb(object_type *o_ptr, object_type *j_ptr);
 extern s16b lookup_kind(int tval, int sval);
@@ -974,6 +1052,8 @@ extern bool make_gold(object_type *j_ptr);
 extern void place_gold(int y, int x);
 extern s16b drop_near(object_type *o_ptr, int chance, int y, int x);
 extern void acquirement(int y1, int x1, int num, bool great, bool known);
+extern void amusement(int y1, int x1, int num, bool known);
+extern void init_normal_traps(void);
 extern s16b choose_random_trap(void);
 extern void disclose_grid(int y, int x);
 extern void place_trap(int y, int x);
@@ -986,6 +1066,7 @@ extern void floor_item_describe(int item);
 extern void floor_item_increase(int item, int num);
 extern void floor_item_optimize(int item);
 extern bool inven_carry_okay(object_type *o_ptr);
+extern bool object_sort_comp(object_type *o_ptr, s32b o_value, object_type *j_ptr);
 extern s16b inven_carry(object_type *o_ptr);
 extern s16b inven_takeoff(int item, int amt);
 extern void inven_drop(int item, int amt);
@@ -995,6 +1076,9 @@ extern void display_koff(int k_idx);
 extern object_type *choose_warning_item(void);
 extern bool process_warning(int xx, int yy);
 extern void do_cmd_kaji(bool only_browse);
+extern void torch_flags(object_type *o_ptr, u32b *flgs);
+extern void torch_dice(object_type *o_ptr, int *dd, int *ds);
+extern void torch_lost_fuel(object_type *o_ptr);
 
 /* racial.c */
 extern bool gain_magic(void);
@@ -1038,8 +1122,8 @@ extern bool detect_monsters_mind(int range);
 extern bool detect_all(int range);
 extern bool wall_stone(void);
 extern bool speed_monsters(void);
-extern bool slow_monsters(void);
-extern bool sleep_monsters(void);
+extern bool slow_monsters(int power);
+extern bool sleep_monsters(int power);
 extern void aggravate_monsters(int who);
 extern bool genocide_aux(int m_idx, int power, bool player_cast, int dam_side, cptr spell_name);
 extern bool symbol_genocide(int power, bool player_cast);
@@ -1056,6 +1140,7 @@ extern bool dispel_demons(int dam);
 extern bool crusade(void);
 extern bool turn_undead(void);
 extern bool destroy_area(int y1, int x1, int r, bool in_generate);
+extern bool earthquake_aux(int cy, int cx, int r, int m_idx);
 extern bool earthquake(int cy, int cx, int r);
 extern void lite_room(int y1, int x1);
 extern void unlite_room(int y1, int x1);
@@ -1070,30 +1155,31 @@ extern bool fire_blast(int typ, int dir, int dd, int ds, int num, int dev);
 extern void call_chaos(void);
 extern bool fire_beam(int typ, int dir, int dam);
 extern bool fire_bolt_or_beam(int prob, int typ, int dir, int dam);
-extern bool lite_line(int dir);
+extern bool lite_line(int dir, int dam);
 extern bool drain_life(int dir, int dam);
 extern bool death_ray(int dir, int plev);
-extern bool wall_to_mud(int dir);
+extern bool wall_to_mud(int dir, int dam);
 extern bool destroy_door(int dir);
 extern bool disarm_trap(int dir);
 extern bool wizard_lock(int dir);
 extern bool heal_monster(int dir, int dam);
-extern bool speed_monster(int dir);
-extern bool slow_monster(int dir);
-extern bool sleep_monster(int dir);
+extern bool speed_monster(int dir, int power);
+extern bool slow_monster(int dir, int power);
+extern bool sleep_monster(int dir, int power);
 extern bool stasis_monster(int dir);    /* Like sleep, affects undead as well */
 extern bool stasis_evil(int dir);    /* Like sleep, affects undead as well */
 extern bool confuse_monster(int dir, int plev);
 extern bool stun_monster(int dir, int plev);
 extern bool fear_monster(int dir, int plev);
-extern bool poly_monster(int dir);
+extern bool poly_monster(int dir, int power);
 extern bool clone_monster(int dir);
-extern bool teleport_monster(int dir);
+extern bool teleport_monster(int dir, int distance);
 extern bool door_creation(void);
 extern bool trap_creation(int y, int x);
 extern bool tree_creation(void);
 extern bool glyph_creation(void);
 extern bool destroy_doors_touch(void);
+extern bool disarm_traps_touch(void);
 extern bool animate_dead(int who, int y, int x);
 extern bool sleep_monsters_touch(void);
 extern bool activate_ty_curse(bool stop_ty, int *count);
@@ -1123,16 +1209,19 @@ extern bool project_hook(int typ, int dir, int dam, int flg);
 extern bool project_hack(int typ, int dam);
 extern bool eat_magic(int power);
 extern void discharge_minion(void);
-extern void kawarimi(bool success);
+extern bool kawarimi(bool success);
 extern bool rush_attack(bool *mdeath);
 extern void remove_all_mirrors(bool explode);
 
 /* spells3.c */
-extern bool teleport_away(int m_idx, int dis, bool dec_valour, bool passive);
-extern void teleport_monster_to(int m_idx, int ty, int tx, int power, bool passive);
-extern bool cave_player_teleportable_bold(int y, int x, bool passive, bool nonmagical);
-extern void teleport_player(int dis, bool passive);
-extern void teleport_player_to(int ny, int nx, bool no_tele, bool passive);
+extern bool teleport_away(int m_idx, int dis, u32b mode);
+extern void teleport_monster_to(int m_idx, int ty, int tx, int power, u32b mode);
+extern bool cave_player_teleportable_bold(int y, int x, u32b mode);
+extern bool teleport_player_aux(int dis, u32b mode);
+extern void teleport_player(int dis, u32b mode);
+extern void teleport_player_away(int m_idx, int dis);
+extern void teleport_player_to(int ny, int nx, u32b mode);
+extern void teleport_away_followable(int m_idx);
 extern void teleport_level(int m_idx);
 extern int choose_dungeon(cptr note, int y, int x);
 extern bool recall_player(int turns);
@@ -1181,20 +1270,23 @@ 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(int dam, cptr kb_str, int monspell);
-extern int elec_dam(int dam, cptr kb_str, int monspell);
-extern int fire_dam(int dam, cptr kb_str, int monspell);
-extern int cold_dam(int dam, cptr kb_str, int monspell);
+extern int acid_dam(int dam, cptr kb_str, int monspell, bool aura);
+extern int elec_dam(int dam, cptr kb_str, int monspell, bool aura);
+extern int fire_dam(int dam, cptr kb_str, int monspell, bool aura);
+extern int cold_dam(int 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);
 extern bool curse_weapon(bool force, int slot);
 extern bool brand_bolts(void);
 extern bool polymorph_monster(int y, int x);
 extern bool dimension_door(void);
 extern bool mirror_tunnel(void);
 extern bool summon_kin_player(int level, int y, int x, u32b mode);
+extern void massacre(int py, int px);
 
 /* store.c */
+extern bool combine_and_reorder_home(int store_num);
 extern void do_cmd_store(void);
 extern void store_shuffle(int which);
 extern void store_maint(int town_num, int store_num);
@@ -1211,6 +1303,9 @@ extern void quest_discovery(int q_idx);
 extern int quest_number(int level);
 extern int random_quest_number(int level);
 extern bool tele_town(void);
+extern s16b calc_crit_ratio_shot(int weight, int plus_ammo,int plus_bow, int dam);
+extern s16b calc_expect_crit_shot(int weight, int plus_ammo,int plus_bow, int dam);
+extern s16b calc_expect_crit(int weight, int plus, int dam, s16b meichuu, bool dokubari);
 
 /* util.c */
 extern errr path_parse(char *buf, int max, cptr file);
@@ -1299,6 +1394,9 @@ extern void prt_time(void);
 extern cptr map_name(void);
 extern u32b weight_limit(void);
 extern bool buki_motteruka(int i);
+extern bool is_heavy_shoot(object_type *o_ptr);
+extern int bow_tval_ammo(object_type *o_ptr);
+extern s16b calc_num_fire(object_type *o_ptr);
 extern void calc_bonuses(void);
 extern void notice_stuff(void);
 extern void update_stuff(void);
@@ -1307,11 +1405,14 @@ extern void window_stuff(void);
 extern void handle_stuff(void);
 extern s16b empty_hands(bool riding_control);
 extern bool heavy_armor(void);
+extern void print_monster_list(int x, int y, int max_lines);
+extern void update_playtime(void);
 
 
 /* effects.c */
 extern void set_action(int typ);
 extern void reset_tim_flags(void);
+extern void dispel_player(void);
 extern bool set_mimic(int v, int p, bool do_dec);
 extern bool set_blind(int v);
 extern bool set_confused(int v);
@@ -1381,7 +1482,9 @@ extern bool set_superstealth(bool set);
 
 /* xtra2.c */
 extern void check_experience(void);
+extern void complete_quest(int quest_num);
 extern void check_quest_completion(monster_type *m_ptr);
+extern void check_find_art_quest_completion(object_type *o_ptr);
 extern cptr extract_note_dies(monster_race *r_ptr);
 extern void monster_death(int m_idx, bool drop_item);
 extern bool mon_take_hit(int m_idx, int dam, bool *fear, cptr note);
@@ -1397,6 +1500,7 @@ extern void ang_sort(vptr u, vptr v, int n);
 extern bool target_able(int m_idx);
 extern bool target_okay(void);
 extern bool target_set(int mode);
+extern void target_set_prepare_look();
 extern bool get_aim_dir(int *dp);
 extern bool get_hack_dir(int *dp);
 extern bool get_rep_dir(int *dp, bool under);
@@ -1413,12 +1517,15 @@ extern cptr your_alignment(void);
 extern int weapon_exp_level(int weapon_exp);
 extern int riding_exp_level(int riding_exp);
 extern int spell_exp_level(int spell_exp);
+extern void display_rumor(bool ex);
 
 /* mspells1.c */
-extern bool clean_shot(int y1, int x1, int y2, int x2, bool friend);
+extern bool clean_shot(int y1, int x1, int y2, int x2, bool is_friend);
 extern bool summon_possible(int y1, int x1);
 extern bool raise_possible(monster_type *m_ptr);
+extern bool dispel_check(int m_idx);
 extern bool spell_is_inate(u16b spell);
+extern bool make_attack_spell(int m_idx);
 
 /* mspells2.c */
 extern void get_project_point(int sy, int sx, int *ty, int *tx, int flg);
@@ -1433,10 +1540,14 @@ extern void one_dragon_ele_resistance(object_type *o_ptr);
 extern void one_low_esp(object_type *o_ptr);
 extern void one_resistance(object_type *o_ptr);
 extern void one_ability(object_type *o_ptr);
+extern void one_activation(object_type *o_ptr);
 extern bool create_artifact(object_type *o_ptr, bool a_scroll);
+extern int activation_index(object_type *o_ptr);
 extern bool activate_random_artifact(object_type * o_ptr);
+extern const activation_type* find_activation_info(object_type *o_ptr);
+extern void get_bloody_moon_flags(object_type *o_ptr);
 extern void random_artifact_resistance(object_type * o_ptr, artifact_type *a_ptr);
-extern void create_named_art(int a_idx, int y, int x);
+extern bool create_named_art(int a_idx, int y, int x);
 
 /* scores.c */
 extern void display_scores_aux(int from, int to, int note, high_score *score);
@@ -1468,6 +1579,7 @@ extern void hissatsu_info(char *p, int power);
 extern void do_cmd_hissatsu(void);
 extern void do_cmd_hissatsu_browse(void);
 extern void do_cmd_gain_hissatsu(void);
+extern s16b mult_hissatsu(int mult, u32b *flgs, monster_type *m_ptr, int mode);
 
 /* mutation.c */
 extern int count_bits(u32b x);
@@ -1505,12 +1617,20 @@ extern int usleep(huge usecs);
 /* extern void main(void); */
 #endif
 
-#if defined(MAC_MPW)
+#if defined(MAC_MPW) || defined(MACH_O_CARBON)
 /* Globals needed */
 extern  u32b _ftype;
 extern  u32b _fcreator;
 #endif
 
+#if defined(MAC_MPW) && defined(CARBON)
+extern void convert_pathname(char *path);
+#endif
+
+#if defined(MACH_O_CARBON)
+extern void fsetfileinfo(cptr path, u32b fcreator, u32b ftype);
+#endif
+
 #ifdef WINDOWS
 /* main-win.c */
 /* extern int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, ...); */
@@ -1570,7 +1690,6 @@ extern bool object_is_weapon_ammo(object_type *o_ptr);
 extern bool object_is_ammo(object_type *o_ptr);
 extern bool object_is_armour(object_type *o_ptr);
 extern bool object_is_weapon_armour_ammo(object_type *o_ptr);
-extern bool object_is_weapon_armour_ammo(object_type *o_ptr);
 extern bool object_is_melee_weapon(object_type *o_ptr);
 extern bool object_is_wearable(object_type *o_ptr);
 extern bool object_is_equipment(object_type *o_ptr);
@@ -1579,6 +1698,7 @@ extern bool object_allow_enchant_weapon(object_type *o_ptr);
 extern bool object_allow_enchant_melee_weapon(object_type *o_ptr);
 extern bool object_is_smith(object_type *o_ptr);
 extern bool object_is_artifact(object_type *o_ptr);
+extern bool object_is_random_artifact(object_type *o_ptr);
 extern bool object_is_nameless(object_type *o_ptr);
 extern bool object_allow_two_hands_wielding(object_type *o_ptr);
 
@@ -1587,6 +1707,7 @@ extern void set_floor_and_wall(byte type);
 extern void wilderness_gen(void);
 extern void wilderness_gen_small(void);
 extern errr init_wilderness(void);
+extern void init_wilderness_terrains(void);
 extern void seed_wilderness(void);
 extern errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int xmax, int *y, int *x);
 extern bool change_wild_mode(void);
@@ -1608,6 +1729,7 @@ extern void dump_virtues(FILE * OutFile);
 
 #ifdef JP
 /* japanese.c */
+extern void sindarin_to_kana(char *kana, const char *sindarin);
 extern void jverb1( const char *in , char *out);
 extern void jverb2( const char *in , char *out);
 extern void jverb3( const char *in , char *out);
@@ -1642,3 +1764,38 @@ extern void flush_ringbuf(void);
 extern void prepare_chuukei_hooks(void);
 #endif
 
+extern void prepare_movie_hooks(void);
+extern void prepare_browse_movie_aux(cptr filename);
+extern void prepare_browse_movie(cptr filename);
+extern void browse_movie(void);
+extern bool browsing_movie;
+
+#ifdef TRAVEL
+/* for travel */
+extern travel_type travel;
+#endif
+
+/* variable.c (for snipers) */
+extern int snipe_type;
+extern bool reset_concent;   /* Concentration reset flag */
+extern bool is_fired;
+
+/* snipe.c */
+extern void reset_concentration(bool msg);
+extern void display_snipe_list(void);
+extern int tot_dam_aux_snipe (int mult, monster_type *m_ptr);
+extern void do_cmd_snipe(void);
+extern void do_cmd_snipe_browse(void);
+extern int boost_concentration_damage(int tdam);
+
+/* hex.c */
+extern bool stop_hex_spell_all(void);
+extern bool stop_hex_spell(void);
+extern void check_hex(void);
+extern bool hex_spell_fully(void);
+extern void revenge_spell();
+extern void revenge_store(int dam);
+extern bool teleport_barrier(int m_idx);
+extern bool magic_barrier(int m_idx);
+extern bool multiply_barrier(int m_idx);
+