X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=cad74e5b8ecbc45dbaec99d10a878d5b0028bd33;hb=7bdabc50285d97192a7cd286ebf825c2329b9235;hp=3063b5346b72a7315122014d1c75c093017eee7e;hpb=741ceac26baa0a26efb454653fff83ff33c3023b;p=hengband%2Fhengband.git diff --git a/src/externs.h b/src/externs.h index 3063b5346..cad74e5b8 100644 --- a/src/externs.h +++ b/src/externs.h @@ -18,11 +18,11 @@ * Automatically generated "variable" declarations */ extern int max_macrotrigger; -extern cptr macro_template; -extern cptr macro_modifier_chr; -extern cptr macro_modifier_name[MAX_MACRO_MOD]; -extern cptr macro_trigger_name[MAX_MACRO_TRIG]; -extern cptr macro_trigger_keycode[2][MAX_MACRO_TRIG]; +extern concptr macro_template; +extern concptr macro_modifier_chr; +extern concptr macro_modifier_name[MAX_MACRO_MOD]; +extern concptr macro_trigger_name[MAX_MACRO_TRIG]; +extern concptr macro_trigger_keycode[2][MAX_MACRO_TRIG]; extern int level_up; @@ -44,7 +44,7 @@ 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 concptr color_char; extern const byte adj_mag_study[]; extern const byte adj_mag_mana[]; extern const byte adj_mag_fail[]; @@ -69,7 +69,6 @@ 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]; @@ -82,45 +81,45 @@ 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[]; +extern const concptr realm_names[]; #ifdef JP -extern const cptr E_realm_names[]; +extern const concptr E_realm_names[]; #endif -extern const cptr spell_names[VALID_REALM][32]; +extern const concptr 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 cptr chaos_patrons[MAX_PATRON]; +extern const concptr player_title[MAX_CLASS][PY_MAX_LEVEL/5]; +extern const concptr color_names[16]; +extern const concptr stat_names[6]; +extern const concptr stat_names_reduced[6]; +extern const concptr window_flag_desc[32]; +extern const concptr 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 concptr 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]; +extern const concptr exp_level_str[5]; +extern const concptr silly_attacks[MAX_SILLY_ATTACK]; #ifdef JP -extern const cptr silly_attacks2[MAX_SILLY_ATTACK]; +extern const concptr silly_attacks2[MAX_SILLY_ATTACK]; #endif extern const monster_power monster_powers[MAX_MONSPELLS]; -extern const cptr monster_powers_short[MAX_MONSPELLS]; -extern const cptr ident_info[]; +extern const concptr monster_powers_short[MAX_MONSPELLS]; +extern const concptr 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[]; -extern const cptr artifact_bias_name[MAX_BIAS]; +extern const concptr artifact_bias_name[MAX_BIAS]; extern const option_type option_info[]; extern const option_type cheat_info[CHEAT_MAX]; extern const option_type autosave_info[2]; /* variable.c */ -extern const cptr copyright[5]; +extern const concptr copyright[5]; extern byte h_ver_major; extern byte h_ver_minor; extern byte h_ver_patch; @@ -170,12 +169,12 @@ extern DEPTH object_level; extern DEPTH monster_level; extern DEPTH base_level; extern bool invoking_midnight_curse; -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 GAME_TURN turn; +extern GAME_TURN turn_limit; +extern GAME_TURN dungeon_turn; +extern GAME_TURN dungeon_turn_limit; +extern GAME_TURN old_turn; +extern GAME_TURN old_battle; extern bool use_sound; extern bool use_music; extern bool use_graphics; @@ -194,8 +193,8 @@ extern bool repair_monsters; extern bool repair_objects; extern s16b inven_cnt; extern s16b equip_cnt; -extern s16b o_max; -extern s16b o_cnt; +extern OBJECT_IDX o_max; +extern OBJECT_IDX o_cnt; extern MONSTER_IDX m_max; extern MONSTER_IDX m_cnt; extern MONSTER_IDX hack_m_idx; @@ -221,7 +220,7 @@ extern bool closing_flag; extern POSITION panel_row_min, panel_row_max; extern POSITION panel_col_min, panel_col_max; extern POSITION panel_col_prt, panel_row_prt; -extern IDX target_who; +extern MONSTER_IDX target_who; extern POSITION target_col; extern POSITION target_row; extern int player_uid; @@ -246,12 +245,12 @@ extern POSITION_IDX redraw_n; extern POSITION redraw_y[REDRAW_MAX]; extern POSITION redraw_x[REDRAW_MAX]; extern s16b macro__num; -extern cptr *macro__pat; -extern cptr *macro__act; +extern concptr *macro__pat; +extern concptr *macro__act; extern bool *macro__cmd; extern char *macro__buf; extern STR_OFFSET quark__num; -extern cptr *quark__str; +extern concptr *quark__str; extern u32b message__next; extern u32b message__last; extern u32b message__head; @@ -265,11 +264,11 @@ 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]; -extern const cptr angband_sound_name[SOUND_MAX]; -extern const cptr angband_music_basic_name[MUSIC_BASIC_MAX]; +extern const concptr angband_sound_name[SOUND_MAX]; +extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX]; extern cave_type *cave[MAX_HGT]; extern saved_floor_type saved_floors[MAX_SAVED_FLOORS]; -extern s16b max_floor_id; +extern FLOOR_IDX max_floor_id; extern u32b saved_floor_file_sign; extern object_type *o_list; extern monster_type *m_list; @@ -286,7 +285,7 @@ extern TERM_COLOR misc_to_attr[256]; extern char misc_to_char[256]; extern TERM_COLOR tval_to_attr[128]; extern char tval_to_char[128]; -extern cptr keymap_act[KEYMAP_MODES][256]; +extern concptr keymap_act[KEYMAP_MODES][256]; extern player_type *p_ptr; extern const player_sex *sp_ptr; extern const player_race *rp_ptr; @@ -317,24 +316,22 @@ extern char *r_text; extern dungeon_info_type *d_info; extern char *d_name; extern char *d_text; -extern cptr ANGBAND_SYS; -extern cptr ANGBAND_KEYBOARD; -extern cptr ANGBAND_GRAF; -extern cptr ANGBAND_DIR; -extern cptr ANGBAND_DIR_APEX; -extern cptr ANGBAND_DIR_BONE; -extern cptr ANGBAND_DIR_DATA; -extern cptr ANGBAND_DIR_EDIT; -extern cptr ANGBAND_DIR_SCRIPT; -extern cptr ANGBAND_DIR_FILE; -extern cptr ANGBAND_DIR_HELP; -extern cptr ANGBAND_DIR_INFO; -extern cptr ANGBAND_DIR_PREF; -extern cptr ANGBAND_DIR_SAVE; -extern cptr ANGBAND_DIR_USER; -extern cptr ANGBAND_DIR_XTRA; -extern bool item_tester_full; -extern bool item_tester_no_ryoute; +extern concptr ANGBAND_SYS; +extern concptr ANGBAND_KEYBOARD; +extern concptr ANGBAND_GRAF; +extern concptr ANGBAND_DIR; +extern concptr ANGBAND_DIR_APEX; +extern concptr ANGBAND_DIR_BONE; +extern concptr ANGBAND_DIR_DATA; +extern concptr ANGBAND_DIR_EDIT; +extern concptr ANGBAND_DIR_SCRIPT; +extern concptr ANGBAND_DIR_FILE; +extern concptr ANGBAND_DIR_HELP; +extern concptr ANGBAND_DIR_INFO; +extern concptr ANGBAND_DIR_PREF; +extern concptr ANGBAND_DIR_SAVE; +extern concptr ANGBAND_DIR_USER; +extern concptr ANGBAND_DIR_XTRA; extern OBJECT_TYPE_VALUE item_tester_tval; extern bool (*item_tester_hook)(object_type *o_ptr); extern bool (*ang_sort_comp)(vptr u, vptr v, int a, int b); @@ -348,11 +345,11 @@ extern wilderness_type **wilderness; extern building_type building[MAX_BLDG]; extern QUEST_IDX max_q_idx; extern MONRACE_IDX max_r_idx; -extern IDX max_k_idx; -extern IDX max_v_idx; -extern IDX max_f_idx; +extern KIND_OBJECT_IDX max_k_idx; +extern VAULT_IDX max_v_idx; +extern FEAT_IDX max_f_idx; extern ARTIFACT_IDX max_a_idx; -extern IDX max_e_idx; +extern EGO_IDX max_e_idx; extern DUNGEON_IDX max_d_idx; extern OBJECT_IDX max_o_idx; extern MONSTER_IDX max_m_idx; @@ -390,7 +387,7 @@ extern bool new_mane; extern bool mon_fight; extern bool ambush_flag; extern bool generate_encounter; -extern cptr screen_dump; +extern concptr screen_dump; /*** Terrain feature variables ***/ extern FEAT_IDX feat_none; @@ -398,7 +395,6 @@ extern FEAT_IDX feat_floor; extern FEAT_IDX feat_glyph; extern FEAT_IDX feat_explosive_rune; extern FEAT_IDX feat_mirror; -extern door_type feat_door[MAX_DOOR_TYPES]; extern FEAT_IDX feat_up_stair; extern FEAT_IDX feat_down_stair; extern FEAT_IDX feat_entrance; @@ -428,6 +424,14 @@ extern FEAT_IDX feat_deep_water; extern FEAT_IDX feat_shallow_water; extern FEAT_IDX feat_deep_lava; extern FEAT_IDX feat_shallow_lava; +extern FEAT_IDX feat_heavy_cold_zone; +extern FEAT_IDX feat_cold_zone; +extern FEAT_IDX feat_heavy_electrical_zone; +extern FEAT_IDX feat_electrical_zone; +extern FEAT_IDX feat_deep_acid_puddle; +extern FEAT_IDX feat_shallow_acid_puddle; +extern FEAT_IDX feat_deep_poisonous_puddle; +extern FEAT_IDX feat_shallow_poisonous_puddle; extern FEAT_IDX feat_dirt; extern FEAT_IDX feat_grass; extern FEAT_IDX feat_flower; @@ -450,7 +454,7 @@ extern bool use_menu; /* autopick.c */ extern void autopick_load_pref(bool disp_mes); extern errr process_autopick_file_command(char *buf); -extern cptr autopick_line_from_entry(autopick_type *entry); +extern concptr autopick_line_from_entry(autopick_type *entry); extern int is_autopick(object_type *o_ptr); extern void autopick_alter_item(INVENTORY_IDX item, bool destroy); extern void autopick_delayed_alter(void); @@ -459,11 +463,10 @@ extern bool autopick_autoregister(object_type *o_ptr); extern void do_cmd_edit_autopick(void); /* birth.c */ -extern void add_history_from_pref_line(cptr t); +extern void add_history_from_pref_line(concptr t); extern void player_birth(void); extern void get_max_stats(void); extern void get_height_weight(void); -extern void determine_random_questor(quest_type *q_ptr); extern void player_outfit(void); extern void dump_yourself(FILE *fff); @@ -481,7 +484,7 @@ extern bool no_lite(void); extern void apply_default_feat_lighting(TERM_COLOR f_attr[F_LIT_MAX], SYMBOL_CODE f_char[F_LIT_MAX]); extern void map_info(POSITION y, POSITION x, TERM_COLOR *ap, char *cp, TERM_COLOR *tap, char *tcp); extern void move_cursor_relative(int row, int col); -extern void print_rel(char c, byte a, TERM_LEN y, TERM_LEN x); +extern void print_rel(SYMBOL_CODE c, TERM_COLOR a, TERM_LEN y, TERM_LEN x); extern void note_spot(POSITION y, POSITION x); extern void display_dungeon(void); extern void lite_spot(POSITION y, POSITION x); @@ -520,16 +523,16 @@ 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); +extern bool is_open(FEAT_IDX feat); /* cmd1.c */ -extern bool test_hit_norm(int chance, ARMOUR_CLASS ac, int vis); extern HIT_POINT critical_shot(WEIGHT weight, int plus_ammo, int plus_bow, HIT_POINT dam); extern HIT_POINT tot_dam_aux(object_type *o_ptr, HIT_POINT tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown); extern void search(void); extern void py_pickup_aux(OBJECT_IDX o_idx); 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 player_can_enter(FEAT_IDX feature, BIT_FLAGS16 mode); extern bool move_player_effect(POSITION ny, POSITION nx, BIT_FLAGS mpe_mode); extern bool trap_can_be_ignored(FEAT_IDX feat); extern void move_player(DIRECTION dir, bool do_pickup, bool break_trap); @@ -539,6 +542,7 @@ extern void travel_step(void); #endif /* cmd2.c */ +extern bool cmd_limit_arena(player_type *creature_ptr); extern void forget_travel_flow(void); extern bool confirm_leave_level(bool down_stair); extern void do_cmd_go_up(void); @@ -556,7 +560,7 @@ extern void do_cmd_stay(bool pickup); extern void do_cmd_run(void); extern void do_cmd_rest(void); extern void do_cmd_fire(void); -extern void do_cmd_fire_aux(INVENTORY_IDX item, object_type *j_ptr); +extern void exe_fire(INVENTORY_IDX item, object_type *j_ptr); extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken); #ifdef TRAVEL extern void do_cmd_travel(void); @@ -564,15 +568,15 @@ extern void do_cmd_travel(void); /* cmd4.c */ #ifndef JP -extern cptr get_ordinal_number_suffix(int num); +extern concptr get_ordinal_number_suffix(int num); #endif -extern errr do_cmd_write_nikki(int type, int num, cptr note); +extern errr do_cmd_write_nikki(int type, int num, concptr note); extern void do_cmd_nikki(void); extern void do_cmd_redraw(void); extern void do_cmd_change_name(void); extern void do_cmd_message_one(void); extern void do_cmd_messages(int num_now); -extern void do_cmd_options_aux(int page, cptr info); +extern void do_cmd_options_aux(int page, concptr info); extern void do_cmd_options(void); extern void do_cmd_pref(void); extern void do_cmd_reload_autopick(void); @@ -585,8 +589,8 @@ extern void do_cmd_feeling(void); extern void do_cmd_load_screen(void); extern void do_cmd_save_screen_html_aux(char *filename, int message); extern void do_cmd_save_screen(void); -extern void do_cmd_knowledge_quests_completed(FILE *fff, IDX quest_num[]); -extern void do_cmd_knowledge_quests_failed(FILE *fff, IDX quest_num[]); +extern void do_cmd_knowledge_quests_completed(FILE *fff, QUEST_IDX quest_num[]); +extern void do_cmd_knowledge_quests_failed(FILE *fff, QUEST_IDX quest_num[]); extern bool ang_sort_comp_quest_num(vptr u, vptr v, int a, int b); extern void ang_sort_swap_quest_num(vptr u, vptr v, int a, int b); extern void do_cmd_knowledge(void); @@ -594,15 +598,8 @@ extern void plural_aux(char * Name); extern void do_cmd_checkquest(void); extern void do_cmd_time(void); -/* cmd5.c */ -extern cptr spell_category_name(OBJECT_TYPE_VALUE tval); -extern void do_cmd_browse(void); -extern void do_cmd_study(void); -extern void do_cmd_cast(void); - /* cmd-spell.c */ -extern void stop_singing(void); -extern cptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode); +extern concptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode); extern bool trump_summoning(int num, bool pet, POSITION y, POSITION x, DEPTH lev, int type, BIT_FLAGS mode); /* dungeon.c */ @@ -622,18 +619,18 @@ extern void safe_setuid_grab(void); extern s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode); extern void display_player(int mode); extern errr make_character_dump(FILE *fff); -extern errr file_character(cptr name); +extern errr file_character(concptr name); extern errr process_pref_file_command(char *buf); -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); +extern concptr process_pref_file_expr(char **sp, char *fp); +extern errr process_pref_file(concptr name); +extern errr process_autopick_file(concptr name); +extern errr process_histpref_file(concptr name); extern void print_equippy(void); extern errr check_time_init(void); extern errr check_load_init(void); extern errr check_time(void); extern errr check_load(void); -extern bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode); +extern bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode); extern void do_cmd_help(void); extern void process_player_name(bool sf); extern void get_name(void); @@ -646,10 +643,10 @@ extern void exit_game_panic(void); extern void signals_ignore_tstp(void); extern void signals_handle_tstp(void); extern void signals_init(void); -extern errr get_rnd_line(cptr file_name, int entry, char *output); +extern errr get_rnd_line(concptr file_name, int entry, char *output); #ifdef JP -extern errr get_rnd_line_jonly(cptr file_name, int entry, char *output, int count); +extern errr get_rnd_line_jonly(concptr file_name, int entry, char *output, int count); #endif extern errr counts_write(int where, u32b count); extern u32b counts_read(int where); @@ -668,7 +665,7 @@ extern void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode); extern void init_saved_floors(bool force); extern void clear_saved_floor_files(void); extern saved_floor_type *get_sf_ptr(FLOOR_IDX floor_id); -extern s16b get_new_floor_id(void); +extern FLOOR_IDX get_new_floor_id(void); extern void prepare_change_floor_mode(BIT_FLAGS mode); extern void precalc_cur_num_of_pet(void); extern void leave_floor(void); @@ -681,28 +678,24 @@ extern bool build_tunnel2(POSITION x1, POSITION y1, POSITION x2, POSITION y2, in /* init1.c */ extern byte color_char_to_attr(char c); -extern s16b f_tag_to_index(cptr str); -extern errr process_dungeon_file(cptr name, int ymin, int xmin, int ymax, int xmax); +extern s16b f_tag_to_index(concptr str); +extern errr process_dungeon_file(concptr name, int ymin, int xmin, int ymax, int xmax); /* init2.c */ extern void init_file_paths(char *path); -extern cptr err_str[PARSE_ERROR_MAX]; +extern concptr 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 s16b f_tag_to_index_in_init(concptr str); extern void init_angband(void); -extern cptr get_check_sum(void); +extern concptr get_check_sum(void); /* load.c */ extern errr rd_savefile_new(void); extern bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode); -/* melee1.c */ /* monster-process.c */ extern bool test_hit_fire(int chance, monster_type *m_ptr, int vis, char* o_name); -extern HIT_POINT critical_norm(WEIGHT weight, int plus, HIT_POINT dam, s16b meichuu, BIT_FLAGS mode); -extern bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode); -extern bool make_attack_normal(MONSTER_IDX m_idx); extern void process_monsters(void); extern void process_monster(MONSTER_IDX m_idx); extern int get_mproc_idx(MONSTER_IDX m_idx, int mproc_type); @@ -716,7 +709,7 @@ extern bool set_monster_monfear(MONSTER_IDX m_idx, int v); extern bool set_monster_invulner(MONSTER_IDX m_idx, int v, bool energy_need); extern void process_monsters_mtimed(int mtimed_idx); extern void dispel_monster_status(MONSTER_IDX m_idx); -extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note, IDX who); +extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *dead, bool *fear, concptr note, IDX who); extern bool process_the_world(int num, MONSTER_IDX who, bool vs_player); extern void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx); @@ -724,7 +717,7 @@ extern void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx); extern void roff_top(MONRACE_IDX r_idx); extern void screen_roff(MONRACE_IDX r_idx, BIT_FLAGS mode); extern void display_roff(MONRACE_IDX r_idx); -extern void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(byte attr, cptr str)); +extern void output_monster_spoiler(MONRACE_IDX r_idx, void (*roff_func)(TERM_COLOR attr, concptr str)); extern void create_name(int type, char *name); extern monsterrace_hook_type get_monster_hook(void); @@ -741,9 +734,9 @@ extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dic /* monster2.c */ -extern cptr horror_desc[MAX_SAN_HORROR]; -extern cptr funny_desc[MAX_SAN_FUNNY]; -extern cptr funny_comments[MAX_SAN_COMMENT]; +extern concptr horror_desc[MAX_SAN_HORROR]; +extern concptr funny_desc[MAX_SAN_FUNNY]; +extern concptr funny_comments[MAX_SAN_COMMENT]; extern void set_target(monster_type *m_ptr, POSITION y, POSITION x); extern void reset_target(monster_type *m_ptr); extern monster_race *real_r_ptr(monster_type *m_ptr); @@ -761,13 +754,6 @@ extern void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER n extern void sanity_blast(monster_type *m_ptr, bool necro); extern void update_monster(MONSTER_IDX m_idx, bool full); extern void update_monsters(bool full); -extern bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_IDX r_idx, BIT_FLAGS mode); -extern bool place_monster(POSITION y, POSITION x, BIT_FLAGS mode); -extern bool alloc_horde(POSITION y, POSITION x); -extern bool alloc_guardian(bool def_val); -extern bool alloc_monster(POSITION dis, BIT_FLAGS mode); -extern bool summon_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int type, BIT_FLAGS mode); -extern bool summon_named_creature (MONSTER_IDX who, POSITION oy, POSITION ox, MONRACE_IDX r_idx, BIT_FLAGS mode); extern bool multiply_monster(MONSTER_IDX m_idx, bool clone, BIT_FLAGS mode); extern void update_smart_learn(MONSTER_IDX m_idx, int what); extern void choose_new_monster(MONSTER_IDX m_idx, bool born, MONRACE_IDX r_idx); @@ -781,23 +767,25 @@ extern int m_bonus(int max, DEPTH level); extern void reset_visuals(void); extern void object_flags(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]); extern void object_flags_known(object_type *o_ptr, BIT_FLAGS flgs[TR_FLAG_SIZE]); -extern cptr item_activation(object_type *o_ptr); +extern concptr item_activation(object_type *o_ptr); extern bool screen_object(object_type *o_ptr, BIT_FLAGS mode); extern char index_to_label(int i); extern INVENTORY_IDX label_to_inven(int c); extern INVENTORY_IDX label_to_equip(int c); extern s16b wield_slot(object_type *o_ptr); -extern cptr mention_use(int i); -extern cptr describe_use(int i); +extern concptr mention_use(int i); +extern concptr describe_use(int i); extern bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUBTYPE_VALUE book_sval); extern bool item_tester_okay(object_type *o_ptr); extern void display_inven(void); extern void display_equip(void); -extern COMMAND_CODE show_inven(int target_item); -extern COMMAND_CODE show_equip(int target_item); +extern COMMAND_CODE show_inven(int target_item, BIT_FLAGS mode); +extern COMMAND_CODE show_equip(int target_item, BIT_FLAGS mode); extern void toggle_inven_equip(void); extern bool can_get_item(void); -extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode); +extern bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode); +extern object_type *choose_object(OBJECT_IDX *idx, concptr q, concptr s, BIT_FLAGS option); +PERCENTAGE breakage_chance(object_type *o_ptr); /* object2.c */ extern void excise_object_idx(OBJECT_IDX o_idx); @@ -834,11 +822,11 @@ extern void acquirement(POSITION y1, POSITION x1, int num, bool great, bool spec extern void amusement(POSITION y1, POSITION x1, int num, bool known); extern void inven_item_charges(INVENTORY_IDX item); extern void inven_item_describe(INVENTORY_IDX item); -extern void inven_item_increase(INVENTORY_IDX item, int num); +extern void inven_item_increase(INVENTORY_IDX item, ITEM_NUMBER num); extern void inven_item_optimize(INVENTORY_IDX item); extern void floor_item_charges(INVENTORY_IDX item); extern void floor_item_describe(INVENTORY_IDX item); -extern void floor_item_increase(INVENTORY_IDX item, int num); +extern void floor_item_increase(INVENTORY_IDX item, ITEM_NUMBER num); extern void floor_item_optimize(INVENTORY_IDX 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); @@ -854,10 +842,9 @@ extern void do_cmd_kaji(bool only_browse); extern void torch_flags(object_type *o_ptr, BIT_FLAGS *flgs); extern void torch_dice(object_type *o_ptr, DICE_NUMBER *dd, DICE_SID *ds); extern void torch_lost_fuel(object_type *o_ptr); -extern cptr essence_name[]; +extern concptr essence_name[]; /* racial.c */ -extern bool gain_magic(void); extern void do_cmd_racial_power(void); /* save.c */ @@ -870,14 +857,14 @@ extern bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode); extern PERCENTAGE beam_chance(void); extern bool in_disintegration_range(POSITION y1, POSITION x1, POSITION y2, POSITION x2); extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, POSITION *pgm_rad, POSITION rad, POSITION y1, POSITION x1, POSITION y2, POSITION x2, EFFECT_ID typ); -extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell); +extern int take_hit(int damage_type, HIT_POINT damage, concptr kb_str, int monspell); extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, EFFECT_ID typ); -extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, BIT_FLAGS flg); extern POSITION dist_to_line(POSITION y, POSITION x, POSITION y1, POSITION x1, POSITION y2, POSITION x2); extern bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, EFFECT_ID typ, BIT_FLAGS flg, int monspell); extern int project_length; extern bool binding_field(HIT_POINT dam); extern void seal_of_mirror(HIT_POINT dam); +extern concptr spell_category_name(OBJECT_TYPE_VALUE tval); /* spells2.c */ extern void message_pain(MONSTER_IDX m_idx, HIT_POINT dam); @@ -892,7 +879,7 @@ extern bool detect_monsters_normal(POSITION range); extern bool detect_monsters_invis(POSITION range); extern bool detect_monsters_evil(POSITION range); extern bool detect_monsters_xxx(POSITION range, u32b match_flag); -extern bool detect_monsters_string(POSITION range, cptr); +extern bool detect_monsters_string(POSITION range, concptr); extern bool detect_monsters_nonliving(POSITION range); extern bool detect_monsters_mind(POSITION range); extern bool detect_all(POSITION range); @@ -901,7 +888,7 @@ extern bool speed_monsters(void); extern bool slow_monsters(int power); extern bool sleep_monsters(int power); extern void aggravate_monsters(MONSTER_IDX who); -extern bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, cptr spell_name); +extern bool genocide_aux(MONSTER_IDX m_idx, int power, bool player_cast, int dam_side, concptr spell_name); extern bool symbol_genocide(int power, bool player_cast); extern bool mass_genocide(int power, bool player_cast); extern bool mass_genocide_undead(int power, bool player_cast); @@ -913,12 +900,15 @@ extern bool dispel_undead(HIT_POINT dam); extern bool dispel_monsters(HIT_POINT dam); extern bool dispel_living(HIT_POINT dam); extern bool dispel_demons(HIT_POINT dam); +extern bool cleansing_nova(player_type *creature_ptr, bool magic, bool powerful); +extern bool unleash_mana_storm(player_type *creature_ptr, bool powerful); extern bool crusade(void); extern bool turn_undead(void); extern bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate); extern bool earthquake_aux(POSITION cy, POSITION cx, POSITION r, MONSTER_IDX m_idx); extern bool earthquake(POSITION cy, POSITION cx, POSITION r); extern void lite_room(POSITION y1, POSITION x1); +extern bool starlight(bool magic); extern void unlite_room(POSITION y1, POSITION x1); extern bool lite_area(HIT_POINT dam, POSITION rad); extern bool unlite_area(HIT_POINT dam, POSITION rad); @@ -939,17 +929,6 @@ extern bool wall_to_mud(DIRECTION dir, HIT_POINT dam); extern bool destroy_door(DIRECTION dir); extern bool disarm_trap(DIRECTION dir); extern bool wizard_lock(DIRECTION dir); -extern bool heal_monster(DIRECTION dir, HIT_POINT dam); -extern bool speed_monster(DIRECTION dir, int power); -extern bool slow_monster(DIRECTION dir, int power); -extern bool sleep_monster(DIRECTION dir, int power); -extern bool stasis_monster(DIRECTION dir); /* Like sleep, affects undead as well */ -extern bool stasis_evil(DIRECTION dir); /* Like sleep, affects undead as well */ -extern bool confuse_monster(DIRECTION dir, PLAYER_LEVEL plev); -extern bool stun_monster(DIRECTION dir, PLAYER_LEVEL plev); -extern bool fear_monster(DIRECTION dir, PLAYER_LEVEL plev); -extern bool poly_monster(DIRECTION dir, int power); -extern bool clone_monster(DIRECTION dir); extern bool teleport_monster(DIRECTION dir, int distance); extern bool door_creation(void); extern bool trap_creation(POSITION y, POSITION x); @@ -980,7 +959,7 @@ extern bool mindblast_monsters(HIT_POINT dam); extern s32b flag_cost(object_type *o_ptr, int plusses); extern bool teleport_swap(DIRECTION dir); extern bool project_hook(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, BIT_FLAGS flg); -extern bool project_hack(EFFECT_ID typ, HIT_POINT dam); +extern bool project_all_los(EFFECT_ID typ, HIT_POINT dam); extern bool eat_magic(int power); extern void discharge_minion(void); extern bool kawarimi(bool success); @@ -993,7 +972,7 @@ extern bool cast_wrath_of_the_god(HIT_POINT dam, POSITION rad); extern void cast_wonder(DIRECTION dir); extern void cast_invoke_spirits(DIRECTION dir); extern void cast_shuffle(void); -extern bool_hack life_stream(bool_hack message, bool_hack virtue); +extern bool_hack life_stream(bool_hack message, bool_hack virtue_change); extern bool_hack heroism(int base); extern bool_hack berserk(int base); extern bool_hack cure_light_wounds(DICE_NUMBER dice, DICE_SID sides); @@ -1006,6 +985,20 @@ extern void stop_mouth(void); extern bool_hack vampirism(void); extern bool panic_hit(void); extern bool psychometry(void); +extern bool draconian_breath(player_type *creature_ptr); +extern bool android_inside_weapon(player_type *creature_ptr); +extern bool create_ration(player_type *crature_ptr); +extern void hayagake(player_type *creature_ptr); +extern bool double_attack(player_type *creature_ptr); +extern bool comvert_hp_to_mp(player_type *creature_ptr); +extern bool comvert_mp_to_hp(player_type *creature_ptr); +extern bool demonic_breath(player_type *creature_ptr); +extern bool mirror_concentration(player_type *creature_ptr); +extern bool sword_dancing(player_type *creature_ptr); +extern bool confusing_light(player_type *creature_ptr); +extern bool rodeo(player_type *creature_ptr); +extern bool clear_mind(player_type *creature_ptr); +extern bool concentration(player_type *creature_ptr); /* spells3.c */ extern bool teleport_away(MONSTER_IDX m_idx, POSITION dis, BIT_FLAGS mode); @@ -1016,9 +1009,9 @@ extern void teleport_player_away(MONSTER_IDX m_idx, POSITION dis); extern void teleport_player_to(POSITION ny, POSITION nx, BIT_FLAGS mode); extern void teleport_away_followable(MONSTER_IDX m_idx); extern void teleport_level(MONSTER_IDX m_idx); -extern DUNGEON_IDX choose_dungeon(cptr note, POSITION y, POSITION x); -extern bool recall_player(TIME_EFFECT turns); -extern bool word_of_recall(void); +extern DUNGEON_IDX choose_dungeon(concptr note, POSITION y, POSITION x); +extern bool recall_player(player_type *creature_ptr, TIME_EFFECT turns); +extern bool free_level_recall(player_type *creature_ptr); extern bool reset_recall(void); extern bool apply_disenchant(BIT_FLAGS mode); extern void mutate_player(void); @@ -1062,42 +1055,41 @@ extern bool brand_bolts(void); extern bool polymorph_monster(POSITION y, POSITION x); extern bool dimension_door(void); extern bool mirror_tunnel(void); -extern bool summon_kin_player(DEPTH level, POSITION y, POSITION x, BIT_FLAGS mode); extern void massacre(void); extern bool eat_lock(void); extern bool shock_power(void); +extern bool booze(player_type *creature_ptr); +extern bool detonation(player_type *creature_ptr); + /* bldg.c */ -extern bool get_nightmare(MONRACE_IDX r_idx); extern void battle_monsters(void); extern void do_cmd_bldg(void); extern void do_cmd_quest(void); extern void quest_discovery(QUEST_IDX q_idx); -extern QUEST_IDX quest_number(DEPTH level); -extern QUEST_IDX random_quest_number(DEPTH level); extern bool tele_town(void); extern HIT_POINT calc_crit_ratio_shot(HIT_POINT plus_ammo, HIT_POINT plus_bow); extern HIT_POINT calc_expect_crit_shot(WEIGHT weight, int plus_ammo,int plus_bow, HIT_POINT dam); extern HIT_POINT calc_expect_crit(WEIGHT weight, int plus, HIT_POINT dam, s16b meichuu, bool dokubari); /* util.c */ -extern errr path_parse(char *buf, int max, cptr file); -extern errr path_build(char *buf, int max, cptr path, cptr file); -extern FILE *my_fopen(cptr file, cptr mode); +extern errr path_parse(char *buf, int max, concptr file); +extern errr path_build(char *buf, int max, concptr path, concptr file); +extern FILE *my_fopen(concptr file, concptr mode); extern FILE *my_fopen_temp(char *buf, int max); extern errr my_fgets(FILE *fff, char *buf, huge n); -extern errr my_fputs(FILE *fff, cptr buf, huge n); +extern errr my_fputs(FILE *fff, concptr buf, huge n); extern errr my_fclose(FILE *fff); -extern errr fd_kill(cptr file); -extern errr fd_move(cptr file, cptr what); -extern errr fd_copy(cptr file, cptr what); -extern int fd_make(cptr file, BIT_FLAGS mode); -extern int fd_open(cptr file, int flags); +extern errr fd_kill(concptr file); +extern errr fd_move(concptr file, concptr what); +extern errr fd_copy(concptr file, concptr what); +extern int fd_make(concptr file, BIT_FLAGS mode); +extern int fd_open(concptr file, int flags); extern errr fd_lock(int fd, int what); extern errr fd_seek(int fd, huge n); extern errr fd_chop(int fd, huge n); extern errr fd_read(int fd, char *buf, huge n); -extern errr fd_write(int fd, cptr buf, huge n); +extern errr fd_write(int fd, concptr buf, huge n); extern errr fd_close(int fd); extern void flush(void); extern void bell(void); @@ -1105,46 +1097,46 @@ extern errr play_music(int type, int num); extern void select_floor_music(void); extern void sound(int num); extern void move_cursor(int row, int col); -extern void text_to_ascii(char *buf, cptr str); -extern void ascii_to_text(char *buf, cptr str); -extern errr macro_add(cptr pat, cptr act); -extern sint macro_find_exact(cptr pat); +extern void text_to_ascii(char *buf, concptr str); +extern void ascii_to_text(char *buf, concptr str); +extern errr macro_add(concptr pat, concptr act); +extern sint macro_find_exact(concptr pat); extern char inkey(void); -extern cptr quark_str(STR_OFFSET num); +extern concptr quark_str(STR_OFFSET num); extern void quark_init(void); -extern u16b quark_add(cptr str); +extern u16b quark_add(concptr str); extern s32b message_num(void); -extern cptr message_str(int age); -extern void message_add(cptr msg); +extern concptr message_str(int age); +extern void message_add(concptr msg); extern void msg_erase(void); -extern void msg_print(cptr msg); -extern void msg_print_wizard(int cheat_type, cptr msg); +extern void msg_print(concptr msg); +extern void msg_print_wizard(int cheat_type, concptr msg); #ifndef SWIG -extern void msg_format(cptr fmt, ...); -extern void msg_format_wizard(int cheat_type, cptr fmt, ...); +extern void msg_format(concptr fmt, ...); +extern void msg_format_wizard(int cheat_type, concptr fmt, ...); #endif /* SWIG */ extern void screen_save(void); extern void screen_load(void); -extern void c_put_str(TERM_COLOR attr, cptr str, int row, int col); -extern void put_str(cptr str, int row, int col); -extern void c_prt(byte attr, cptr str, int row, int col); -extern void prt(cptr str, int row, int col); -extern void c_roff(byte attr, cptr str); -extern void roff(cptr str); +extern void c_put_str(TERM_COLOR attr, concptr str, TERM_LEN row, TERM_LEN col); +extern void put_str(concptr str, TERM_LEN row, TERM_LEN col); +extern void c_prt(TERM_COLOR attr, concptr str, TERM_LEN row, TERM_LEN col); +extern void prt(concptr str, TERM_LEN row, TERM_LEN col); +extern void c_roff(TERM_COLOR attr, concptr str); +extern void roff(concptr str); extern void clear_from(int row); extern bool askfor_aux(char *buf, int len, bool numpad_cursor); extern bool askfor(char *buf, int len); -extern bool get_string(cptr prompt, char *buf, int len); -extern bool get_check(cptr prompt); -extern bool get_check_strict(cptr prompt, BIT_FLAGS mode); -extern bool get_com(cptr prompt, char *command, bool z_escape); -extern QUANTITY get_quantity(cptr prompt, QUANTITY max); +extern bool get_string(concptr prompt, char *buf, int len); +extern bool get_check(concptr prompt); +extern bool get_check_strict(concptr prompt, BIT_FLAGS mode); +extern bool get_com(concptr prompt, char *command, bool z_escape); +extern QUANTITY get_quantity(concptr prompt, QUANTITY max); extern void pause_line(int row); extern void request_command(int shopping); extern bool is_a_vowel(int ch); extern int get_keymap_dir(char ch); -extern errr type_string(cptr str, uint len); -extern void roff_to_buf(cptr str, int wlen, char *tbuf, size_t bufsize); +extern errr type_string(concptr str, uint len); +extern void roff_to_buf(concptr str, int wlen, char *tbuf, size_t bufsize); #ifdef SORT_R_INFO extern void tag_sort(tag_type elements[], int number); @@ -1155,10 +1147,10 @@ extern byte gamma_table[256]; extern void build_gamma_table(int gamma); #endif /* SUPPORT_GAMMA */ -extern size_t my_strcpy(char *buf, const char *src, size_t bufsize); -extern size_t my_strcat(char *buf, const char *src, size_t bufsize); -extern char *my_strstr(const char *haystack, const char *needle); -extern char *my_strchr(const char *ptr, char ch); +extern size_t my_strcpy(char *buf, concptr src, size_t bufsize); +extern size_t my_strcat(char *buf, concptr src, size_t bufsize); +extern char *my_strstr(concptr haystack, concptr needle); +extern char *my_strchr(concptr ptr, char ch); extern void str_tolower(char *str); extern int inkey_special(bool numpad_cursor); @@ -1166,19 +1158,11 @@ extern int inkey_special(bool numpad_cursor); /* xtra1.c */ extern void cnv_stat(int val, char *out_val); extern s16b modify_stat_value(int value, int amount); -extern bool is_daytime(void); -extern void extract_day_hour_min(int *day, int *hour, int *min); extern void prt_time(void); -extern cptr map_name(void); -extern WEIGHT weight_limit(void); -extern bool buki_motteruka(int i); -extern bool is_heavy_shoot(object_type *o_ptr); +extern concptr map_name(void); 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 handle_stuff(void); -extern BIT_FLAGS16 empty_hands(bool riding_control); -extern bool heavy_armor(void); +extern void update_output(void); extern void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines); extern void update_playtime(void); @@ -1254,23 +1238,20 @@ extern bool set_wraith_form(TIME_EFFECT v, bool do_dec); extern bool set_tim_esp(TIME_EFFECT v, bool do_dec); extern bool set_superstealth(bool set); +/* view-mainwindow.c */ +extern void resize_map(void); +extern void redraw_window(void); +extern bool change_panel(POSITION dy, POSITION dx); + + /* xtra2.c */ extern void check_experience(void); -extern void complete_quest(QUEST_IDX 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(MONRACE_IDX r_idx); +extern concptr extract_note_dies(MONRACE_IDX r_idx); extern void monster_death(MONSTER_IDX m_idx, bool drop_item); -extern bool mon_take_hit(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note); extern void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p); extern void panel_bounds_center(void); -extern void resize_map(void); -extern void redraw_window(void); -extern bool change_panel(POSITION dy, POSITION dx); extern void verify_panel(void); -extern cptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode); -extern void ang_sort_aux(vptr u, vptr v, int p, int q); -extern void ang_sort(vptr u, vptr v, int n); +extern concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode); extern bool target_able(MONSTER_IDX m_idx); extern bool target_okay(void); extern bool target_set(BIT_FLAGS mode); @@ -1279,34 +1260,9 @@ extern bool get_aim_dir(DIRECTION *dp); extern bool get_hack_dir(DIRECTION *dp); extern bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed); extern bool get_rep_dir(DIRECTION *dp, bool under); -extern void gain_level_reward(int chosen_reward); extern bool tgt_pt(POSITION *x, POSITION *y); extern void do_poly_wounds(void); -extern void change_race(CHARACTER_IDX new_race, cptr effect_msg); -extern HIT_POINT mon_damage_mod(monster_type *m_ptr, HIT_POINT dam, bool is_psy_spear); -extern s16b gain_energy(void); -extern ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval); -extern int bow_tmul(OBJECT_SUBTYPE_VALUE sval); -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); - -/* artifact.c */ -extern void one_high_resistance(object_type *o_ptr); -extern void one_lordly_high_resistance(object_type *o_ptr); -extern void one_ele_resistance(object_type *o_ptr); -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 const activation_type* find_activation_info(object_type *o_ptr); -extern void random_artifact_resistance(object_type * o_ptr, artifact_type *a_ptr); -extern bool create_named_art(ARTIFACT_IDX a_idx, POSITION y, POSITION x); +extern void change_race(CHARACTER_IDX new_race, concptr effect_msg); /* scores.c */ extern void display_scores_aux(int from, int to, int note, high_score *score); @@ -1346,7 +1302,7 @@ extern bool monst_spell_monst(MONSTER_IDX m_idx); /* mspells3.c */ extern bool do_cmd_cast_learned(void); extern void learn_spell(int monspell); -extern void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, BIT_FLAGS mode); +extern void set_rf_masks(BIT_FLAGS *f4, BIT_FLAGS *f5, BIT_FLAGS *f6, BIT_FLAGS mode); /* mspells4.c */ extern bool spell_learnable(MONSTER_IDX m_idx); @@ -1361,15 +1317,6 @@ extern void do_cmd_hissatsu(void); extern void do_cmd_gain_hissatsu(void); extern MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, BIT_FLAGS mode); -/* mutation.c */ -extern bool gain_random_mutation(int choose_mut); -extern bool lose_mutation(int choose_mut); -extern void lose_all_mutations(void); -extern void dump_mutations(FILE *OutFile); -extern void do_cmd_knowledge_mutations(void); -extern int calc_mutant_regenerate_mod(void); -extern bool mutation_power_aux(int power); - /* * Hack -- conditional (or "bizarre") externs @@ -1383,7 +1330,7 @@ extern void user_name(char *buf, int id); #if 0 #ifndef HAS_STRICMP /* util.c */ -extern int stricmp(cptr a, cptr b); +extern int stricmp(concptr a, concptr b); #endif #endif @@ -1408,7 +1355,7 @@ extern void convert_pathname(char *path); #endif #if defined(MACH_O_CARBON) -extern void fsetfileinfo(cptr path, u32b fcreator, u32b ftype); +extern void fsetfileinfo(concptr path, u32b fcreator, u32b ftype); #endif #ifdef WINDOWS @@ -1436,7 +1383,7 @@ extern bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir); /* 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); -extern bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode); +extern bool get_item_floor(COMMAND_CODE *cp, concptr pmt, concptr str, BIT_FLAGS mode); extern void py_pickup_floor(bool pickup); /* variable.c */ @@ -1475,46 +1422,39 @@ extern errr parse_line_wilderness(char *buf, int ymin, int xmin, int ymax, int x extern bool change_wild_mode(void); /* wizard1.c */ -extern void spoil_random_artifact(cptr fname); +extern void spoil_random_artifact(concptr fname); /* wizard2.c */ extern void strip_name(char *buf, KIND_OBJECT_IDX k_idx); extern void do_cmd_rerate_aux(void); extern void do_cmd_rerate(bool display); +extern void cheat_death(player_type *creature_ptr); -/* avatar.c */ -extern bool compare_virtue(int type, int num, int tekitou); -extern int virtue_number(int type); -extern cptr virtue[MAX_VIRTUE]; -extern void get_virtues(void); -extern void chg_virtue(int virtue, int amount); -extern void set_virtue(int virtue, int amount); -extern void dump_virtues(FILE * OutFile); #ifdef JP /* japanese.c */ -extern void sindarin_to_kana(char *kana, const char *sindarin); -extern void jverb( const char *in , char *out , int flag); +extern void sindarin_to_kana(char *kana, concptr sindarin); +extern void jverb( concptr in , char *out , int flag); extern void sjis2euc(char *str); extern void euc2sjis(char *str); extern byte codeconv(char *str); -extern bool iskanji2(cptr s, int x); +extern bool iskanji2(concptr s, int x); extern void guess_convert_to_system_encoding(char* strbuf, int buflen); #endif #ifdef WORLD_SCORE /* report.c */ extern errr report_score(void); -extern cptr make_screen_dump(void); +extern concptr make_screen_dump(void); #endif /* inet.c */ extern int soc_write(int sd, char *buf, size_t sz); extern int soc_read(int sd, char *buf, size_t sz); extern void set_proxy(char *default_url, int default_port); -extern int connect_server(int timeout, const char *host, int port); +extern int connect_server(int timeout, concptr host, int port); extern int disconnect_server(int sd); -extern cptr soc_err(void); +extern concptr soc_err(void); #ifdef CHUUKEI /* chuukei.c */ @@ -1528,8 +1468,8 @@ 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 prepare_browse_movie_aux(concptr filename); +extern void prepare_browse_movie(concptr filename); extern void browse_movie(void); extern bool browsing_movie; @@ -1551,18 +1491,8 @@ 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(void); -extern void revenge_store(HIT_POINT dam); -extern bool teleport_barrier(MONSTER_IDX m_idx); -extern bool magic_barrier(MONSTER_IDX m_idx); -extern bool multiply_barrier(MONSTER_IDX m_idx); - extern void kamaenaoshi(INVENTORY_IDX item); extern bool ang_sort_comp_hook(vptr u, vptr v, int a, int b); extern void ang_sort_swap_hook(vptr u, vptr v, int a, int b); +