X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=5679d0ab396781aa204a494aea84547451fe956e;hb=caf5330ec276a4feb0bac1368474cf04e4197ae1;hp=cae54a0455b3758a73f014ba2b85ac23f8ae2b53;hpb=8c4ca74cab86b6bcf55e278424110c1a28ca0931;p=hengband%2Fhengband.git diff --git a/src/externs.h b/src/externs.h index cae54a045..5679d0ab3 100644 --- a/src/externs.h +++ b/src/externs.h @@ -521,15 +521,15 @@ extern bool monk_armour_aux; extern bool monk_notify_aux; extern wilderness_type **wilderness; extern building_type building[MAX_BLDG]; -extern IDX max_quests; +extern QUEST_IDX max_quests; extern MONRACE_IDX max_r_idx; extern IDX max_k_idx; extern IDX max_v_idx; extern IDX max_f_idx; extern IDX max_a_idx; extern IDX max_e_idx; -extern IDX max_d_idx; -extern IDX max_o_idx; +extern DUNGEON_IDX max_d_idx; +extern OBJECT_IDX max_o_idx; extern MONSTER_IDX max_m_idx; extern POSITION max_wild_x; extern POSITION max_wild_y; @@ -688,7 +688,7 @@ extern bool is_glyph_grid(cave_type *c_ptr); extern bool is_explosive_rune_grid(cave_type *c_ptr); extern void mmove2(int *y, int *x, int y1, int x1, int y2, int x2); extern bool projectable(POSITION y1, POSITION x1, POSITION y2, POSITION x2); -extern void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION d, int mode); +extern void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION d, BIT_FLAGS mode); extern void health_track(MONSTER_IDX m_idx); extern void monster_race_track(MONRACE_IDX r_idx); extern void object_kind_track(IDX k_idx); @@ -699,12 +699,12 @@ extern void glow_deep_lava_and_bldg(void); 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 HIT_POINT critical_shot(int weight, int plus_ammo, int plus_bow, HIT_POINT dam); -extern HIT_POINT critical_norm(int weight, int plus, HIT_POINT 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 HIT_POINT critical_norm(int weight, int plus, HIT_POINT dam, s16b meichuu, BIT_FLAGS mode); +extern s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown); extern void search(void); extern void py_pickup_aux(int o_idx); extern void carry(bool pickup); -extern bool py_attack(int y, int x, int mode); +extern bool py_attack(int y, int x, BIT_FLAGS mode); extern bool pattern_seq(int c_y, int c_x, int n_y, int n_x); extern bool player_can_enter(s16b feature, u16b mode); extern bool move_player_effect(POSITION ny, POSITION nx, u32b mpe_mode); @@ -784,8 +784,8 @@ 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 bool ang_sort_comp_quest_num(vptr u, vptr v, QUEST_IDX a, QUEST_IDX b); -extern void ang_sort_swap_quest_num(vptr u, vptr v, QUEST_IDX a, QUEST_IDX b); +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); extern void plural_aux(char * Name); extern void do_cmd_checkquest(void); @@ -819,7 +819,7 @@ extern bool do_cmd_magic_eater(bool only_browse, bool powerful); /* do-spell.c */ extern void stop_singing(void); -extern cptr do_spell(REALM_IDX realm, SPELL_IDX spell, int mode); +extern cptr do_spell(REALM_IDX realm, SPELL_IDX spell, BIT_FLAGS mode); /* dungeon.c */ extern void leave_quest_check(void); @@ -838,8 +838,8 @@ extern void prevent_turn_overflow(void); /* files.c */ extern void safe_setuid_drop(void); extern void safe_setuid_grab(void); -extern s16b tokenize(char *buf, s16b num, char **tokens, int mode); -extern void display_player(int mode); +extern s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode); +extern void display_player(BIT_FLAGS mode); extern errr make_character_dump(FILE *fff); extern errr file_character(cptr name); extern errr process_pref_file_command(char *buf); @@ -852,7 +852,7 @@ 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, int mode); +extern bool show_file(bool show_version, cptr name, cptr what, int line, BIT_FLAGS mode); extern void do_cmd_help(void); extern void process_player_name(bool sf); extern void get_name(void); @@ -881,14 +881,14 @@ 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); +extern void object_desc(char *buf, object_type *o_ptr, BIT_FLAGS mode); /* floors.c */ extern void init_saved_floors(bool force); extern void clear_saved_floor_files(void); extern saved_floor_type *get_sf_ptr(s16b floor_id); extern s16b get_new_floor_id(void); -extern void prepare_change_floor_mode(u32b mode); +extern void prepare_change_floor_mode(BIT_FLAGS mode); extern void precalc_cur_num_of_pet(void); extern void leave_floor(void); extern void change_floor(void); @@ -916,7 +916,7 @@ extern cptr get_check_sum(void); /* load.c */ extern errr rd_savefile_new(void); -extern bool load_floor(saved_floor_type *sf_ptr, u32b mode); +extern bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode); /* melee1.c */ /* melee2.c */ @@ -941,7 +941,7 @@ extern void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx); /* monster1.c */ extern void roff_top(MONRACE_IDX r_idx); -extern void screen_roff(MONRACE_IDX r_idx, int mode); +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 create_name(int type, char *name); @@ -976,9 +976,9 @@ extern void wipe_m_list(void); extern MONSTER_IDX m_pop(void); extern errr get_mon_num_prep(monster_hook_type monster_hook, monster_hook_type monster_hook2); extern MONRACE_IDX get_mon_num(DEPTH level); -extern void monster_desc(char *desc, monster_type *m_ptr, int mode); +extern void monster_desc(char *desc, monster_type *m_ptr, BIT_FLAGS mode); extern int lore_do_probe(MONRACE_IDX r_idx); -extern void lore_treasure(MONSTER_IDX m_idx, int num_item, int num_gold); +extern void lore_treasure(MONSTER_IDX m_idx, ITEM_NUMBER num_item, ITEM_NUMBER num_gold); extern void sanity_blast(monster_type *m_ptr, bool necro); extern void update_mon(MONSTER_IDX m_idx, bool full); extern void update_monsters(bool full); @@ -986,10 +986,10 @@ extern bool place_monster_aux(MONSTER_IDX who, POSITION y, POSITION x, MONRACE_I 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(int dis, u32b mode); +extern bool alloc_monster(int 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, u32b 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); extern byte get_mspeed(monster_race *r_ptr); @@ -1003,7 +1003,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, u32b mode); +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); @@ -1018,7 +1018,7 @@ extern COMMAND_CODE show_inven(int target_item); extern COMMAND_CODE show_equip(int target_item); extern void toggle_inven_equip(void); extern bool can_get_item(void); -extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode); +extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode); /* object2.c */ extern void excise_object_idx(int o_idx); @@ -1066,8 +1066,8 @@ 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); +extern INVENTORY_IDX inven_takeoff(INVENTORY_IDX item, ITEM_NUMBER amt); +extern void inven_drop(INVENTORY_IDX item, ITEM_NUMBER amt); extern void combine_pack(void); extern void reorder_pack(void); extern void display_koff(IDX k_idx); @@ -1087,16 +1087,16 @@ extern void do_cmd_racial_power(void); extern bool save_player(void); extern bool load_player(void); extern void remove_loc(void); -extern bool save_floor(saved_floor_type *sf_ptr, u32b mode); +extern bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode); /* spells1.c */ 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, int typ); extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell); extern u16b bolt_pict(POSITION y, POSITION x, POSITION ny, POSITION nx, int typ); -extern sint project_path(u16b *gp, POSITION range, POSITION y1, POSITION x1, POSITION y2, POSITION x2, int flg); +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, int typ, int flg, int monspell); +extern bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_POINT dam, int 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); @@ -1204,7 +1204,7 @@ extern s32b flag_cost(object_type *o_ptr, int plusses); extern void report_magics(void); extern bool teleport_swap(int dir); extern bool item_tester_hook_recharge(object_type *o_ptr); -extern bool project_hook(int typ, int dir, HIT_POINT dam, int flg); +extern bool project_hook(int typ, int dir, HIT_POINT dam, BIT_FLAGS flg); extern bool project_hack(int typ, HIT_POINT dam); extern bool eat_magic(int power); extern void discharge_minion(void); @@ -1213,26 +1213,26 @@ extern bool rush_attack(bool *mdeath); extern void remove_all_mirrors(bool explode); /* spells3.c */ -extern bool teleport_away(MONSTER_IDX m_idx, int dis, u32b mode); -extern void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION 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 bool teleport_away(MONSTER_IDX m_idx, int dis, BIT_FLAGS mode); +extern void teleport_monster_to(MONSTER_IDX m_idx, POSITION ty, POSITION tx, int power, BIT_FLAGS mode); +extern bool cave_player_teleportable_bold(int y, int x, BIT_FLAGS mode); +extern bool teleport_player_aux(int dis, BIT_FLAGS mode); +extern void teleport_player(int dis, BIT_FLAGS mode); extern void teleport_player_away(MONSTER_IDX m_idx, int dis); -extern void teleport_player_to(POSITION ny, POSITION nx, u32b mode); +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 bool reset_recall(void); -extern bool apply_disenchant(int mode); +extern bool apply_disenchant(BIT_FLAGS mode); extern void mutate_player(void); extern void apply_nexus(monster_type *m_ptr); extern void phlogiston(void); extern void brand_weapon(int brand_type); extern void call_the_(void); -extern void fetch(int dir, int wgt, bool require_los); +extern void fetch(DIRECTION dir, WEIGHT wgt, bool require_los); extern void alter_reality(void); extern bool warding_glyph(void); extern bool place_mirror(void); @@ -1242,7 +1242,7 @@ extern int remove_curse(void); extern int remove_all_curse(void); extern bool alchemy(void); extern bool enchant(object_type *o_ptr, int n, int eflag); -extern bool enchant_spell(int num_hit, int num_dam, int num_ac); +extern bool enchant_spell(HIT_PROB num_hit, HIT_POINT num_dam, ARMOUR_CLASS num_ac); extern bool artifact_scroll(void); extern bool ident_spell(bool only_equip); extern bool mundane_spell(bool only_equip); @@ -1255,9 +1255,9 @@ extern bool potion_smash_effect(MONSTER_IDX who, POSITION y, POSITION x, KIND_OB 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 int mod_spell_chance_1(int chance); -extern int mod_spell_chance_2(int chance); -extern s16b spell_chance(int spell,int 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_POSITION y, TERM_POSITION x, REALM_IDX realm); extern bool hates_acid(object_type *o_ptr); @@ -1281,7 +1281,7 @@ 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(int level, int y, int x, u32b mode); +extern bool summon_kin_player(int level, int y, int x, BIT_FLAGS mode); extern void massacre(void); /* store.c */ @@ -1316,7 +1316,7 @@ 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, int mode); +extern int fd_make(cptr file, BIT_FLAGS mode); extern int fd_open(cptr file, int flags); extern errr fd_lock(int fd, int what); extern errr fd_seek(int fd, huge n); @@ -1360,7 +1360,7 @@ 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, int mode); +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 void pause_line(int row); @@ -1412,7 +1412,7 @@ extern void update_playtime(void); /* effects.c */ -extern void set_action(int typ); +extern void set_action(ACTION_IDX typ); extern void reset_tim_flags(void); extern void dispel_player(void); extern bool set_mimic(TIME_EFFECT v, IDX p, bool do_dec); @@ -1496,12 +1496,12 @@ extern void resize_map(void); extern void redraw_window(void); extern bool change_panel(int dy, int dx); extern void verify_panel(void); -extern cptr look_mon_desc(monster_type *m_ptr, u32b mode); +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 bool target_able(MONSTER_IDX m_idx); extern bool target_okay(void); -extern bool target_set(int mode); +extern bool target_set(BIT_FLAGS mode); extern void target_set_prepare_look(void); extern bool get_aim_dir(DIRECTION *dp); extern bool get_hack_dir(DIRECTION *dp); @@ -1522,7 +1522,6 @@ extern int spell_exp_level(int spell_exp); extern void display_rumor(bool ex); /* artifact.c */ -extern void one_sustain(object_type *o_ptr); 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); @@ -1571,28 +1570,28 @@ extern void bolt(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monsp extern void breath(int y, int x, MONSTER_IDX m_idx, int typ, int dam_hp, int rad, bool breath, int monspell, int target_type); /* mspells2.c */ -extern void get_project_point(int sy, int sx, int *ty, int *tx, int flg); +extern void get_project_point(int sy, int sx, int *ty, int *tx, BIT_FLAGS flg); 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, int mode); +extern void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, BIT_FLAGS mode); /* mspells4.c */ extern bool spell_learnable(MONSTER_IDX m_idx); -extern int monspell_to_player(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx); -extern int monspell_to_monster(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx, IDX t_idx); -extern int monspell_damage(int SPELL_NUM, MONSTER_IDX m_idx, int TYPE); -extern int monspell_race_damage(int SPELL_NUM, MONRACE_IDX r_idx, int TYPE); -extern int monspell_bluemage_damage(int SPELL_NUM, int plev, int TYPE); +extern HIT_POINT monspell_to_player(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx); +extern HIT_POINT monspell_to_monster(int SPELL_NUM, POSITION y, POSITION x, MONSTER_IDX m_idx, IDX t_idx); +extern HIT_POINT monspell_damage(int SPELL_NUM, MONSTER_IDX m_idx, int TYPE); +extern HIT_POINT monspell_race_damage(int SPELL_NUM, MONRACE_IDX r_idx, int TYPE); +extern HIT_POINT monspell_bluemage_damage(int SPELL_NUM, int plev, int TYPE); /* hissatsu.c */ 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 MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, int mode); +extern MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_ptr, BIT_FLAGS mode); /* mutation.c */ extern int count_bits(BIT_FLAGS x); @@ -1683,9 +1682,9 @@ extern bool do_cmd_disarm_aux(int y, int x, int dir); #ifdef ALLOW_EASY_FLOOR /* TNB */ /* object1.c */ -extern int scan_floor(int *items, POSITION y, POSITION x, int mode); +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_POSITION *min_width); -extern bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, int mode); +extern bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, BIT_FLAGS mode); extern void py_pickup_floor(bool pickup); /* variable.c */