X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=7337d0ba083fd8a9d7e84f89e45d5d1c124729f7;hb=924ccf7dec90442b9f1dc29743203792b11fdd3d;hp=160a34d1df798b21fb8107ac98e165b54ee6c83c;hpb=6683e43446dc2af5b31805afc36b7e2a226e3046;p=hengband%2Fhengband.git diff --git a/src/externs.h b/src/externs.h index 160a34d1d..7337d0ba0 100644 --- a/src/externs.h +++ b/src/externs.h @@ -148,8 +148,8 @@ extern bool character_xtra; extern bool creating_savefile; extern u32b seed_flavor; extern u32b seed_town; -extern s16b command_cmd; -extern s16b command_arg; +extern COMMAND_CODE command_cmd; +extern COMMAND_ARG command_arg; extern s16b command_rep; extern DIRECTION command_dir; extern s16b command_see; @@ -182,7 +182,7 @@ extern bool inkey_xtra; extern bool inkey_scan; extern bool inkey_flag; extern bool get_com_no_macros; -extern s16b coin_type; +extern OBJECT_SUBTYPE_VALUE coin_type; extern bool opening_chest; extern bool shimmer_monsters; extern bool shimmer_objects; @@ -193,10 +193,10 @@ extern s16b inven_cnt; extern s16b equip_cnt; extern s16b o_max; extern s16b o_cnt; -extern s16b m_max; -extern s16b m_cnt; -extern s16b hack_m_idx; -extern s16b hack_m_idx_ii; +extern MONSTER_IDX m_max; +extern MONSTER_IDX m_cnt; +extern MONSTER_IDX hack_m_idx; +extern MONSTER_IDX hack_m_idx_ii; extern int total_friends; extern s32b friend_align; extern int leaving_quest; @@ -510,7 +510,7 @@ extern cptr ANGBAND_DIR_USER; extern cptr ANGBAND_DIR_XTRA; extern bool item_tester_full; extern bool item_tester_no_ryoute; -extern byte item_tester_tval; +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); extern void (*ang_sort_swap)(vptr u, vptr v, int a, int b); @@ -522,7 +522,7 @@ extern bool monk_notify_aux; extern wilderness_type **wilderness; extern building_type building[MAX_BLDG]; extern IDX max_quests; -extern IDX max_r_idx; +extern MONRACE_IDX max_r_idx; extern IDX max_k_idx; extern IDX max_v_idx; extern IDX max_f_idx; @@ -530,7 +530,7 @@ extern IDX max_a_idx; extern IDX max_e_idx; extern IDX max_d_idx; extern IDX max_o_idx; -extern IDX max_m_idx; +extern MONSTER_IDX max_m_idx; extern POSITION max_wild_x; extern POSITION max_wild_y; extern quest_type *quest; @@ -553,8 +553,8 @@ extern int sel_monster; extern int battle_odds; extern int kakekin; extern u32b mon_odds[4]; -extern int pet_t_m_idx; -extern int riding_t_m_idx; +extern MONSTER_IDX pet_t_m_idx; +extern MONSTER_IDX riding_t_m_idx; extern s16b kubi_r_idx[MAX_KUBI]; extern s16b today_mon; extern bool write_level; @@ -569,58 +569,58 @@ 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 FEAT_IDX feat_none; +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 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 FEAT_IDX feat_up_stair; +extern FEAT_IDX feat_down_stair; +extern FEAT_IDX feat_entrance; +extern FEAT_IDX feat_trap_open; +extern FEAT_IDX feat_trap_armageddon; +extern FEAT_IDX feat_trap_piranha; +extern FEAT_IDX feat_rubble; +extern FEAT_IDX feat_magma_vein; +extern FEAT_IDX feat_quartz_vein; +extern FEAT_IDX feat_granite; +extern FEAT_IDX feat_permanent; +extern FEAT_IDX feat_glass_floor; +extern FEAT_IDX feat_glass_wall; +extern FEAT_IDX feat_permanent_glass_wall; +extern FEAT_IDX feat_pattern_start; +extern FEAT_IDX feat_pattern_1; +extern FEAT_IDX feat_pattern_2; +extern FEAT_IDX feat_pattern_3; +extern FEAT_IDX feat_pattern_4; +extern FEAT_IDX feat_pattern_end; +extern FEAT_IDX feat_pattern_old; +extern FEAT_IDX feat_pattern_exit; +extern FEAT_IDX feat_pattern_corrupted; +extern FEAT_IDX feat_black_market; +extern FEAT_IDX feat_town; +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_dirt; +extern FEAT_IDX feat_grass; +extern FEAT_IDX feat_flower; +extern FEAT_IDX feat_brake; +extern FEAT_IDX feat_tree; +extern FEAT_IDX feat_mountain; +extern FEAT_IDX feat_swamp; +extern FEAT_IDX feat_undetected; + +extern DUNGEON_IDX dungeon_type; extern DEPTH *max_dlv; -extern s16b feat_wall_outer; -extern s16b feat_wall_inner; -extern s16b feat_wall_solid; -extern s16b floor_type[100], fill_type[100]; +extern FEAT_IDX feat_wall_outer; +extern FEAT_IDX feat_wall_inner; +extern FEAT_IDX feat_wall_solid; +extern FEAT_IDX floor_type[100], fill_type[100]; extern bool now_damaged; -extern s16b now_message; +extern COMMAND_CODE now_message; extern bool use_menu; /* autopick.c */ @@ -644,12 +644,12 @@ extern void player_outfit(void); extern void dump_yourself(FILE *fff); /* cave.c */ -extern int distance(int y1, int x1, int y2, int x2); -extern bool is_trap(int feat); +extern POSITION distance(POSITION y1, POSITION x1, POSITION y2, POSITION x2); +extern bool is_trap(IDX feat); extern bool is_known_trap(cave_type *c_ptr); -extern bool is_closed_door(int feat); +extern bool is_closed_door(IDX feat); extern bool is_hidden_door(cave_type *c_ptr); -extern bool los(int y1, int x1, int y2, int x2); +extern bool los(POSITION y1, POSITION x1, POSITION y2, POSITION 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); @@ -675,7 +675,7 @@ extern void delayed_visual_update(void); extern void forget_flow(void); extern void update_flow(void); extern void update_smell(void); -extern void map_area(int range); +extern void map_area(POSITION range); extern void wiz_lite(bool ninja); extern void wiz_dark(void); extern void cave_set_feat(POSITION y, POSITION x, IDX feat); @@ -687,10 +687,10 @@ extern bool is_mirror_grid(cave_type *c_ptr); 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(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 health_track(IDX m_idx); -extern void monster_race_track(IDX r_idx); +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); extern void disturb(int stop_search, int flush_output); extern void glow_deep_lava_and_bldg(void); @@ -735,7 +735,7 @@ extern void do_cmd_rest(void); 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); +extern bool do_cmd_throw_aux(int mult, bool boomerang, OBJECT_IDX shuriken); #ifdef TRAVEL extern void do_cmd_travel(void); #endif @@ -782,8 +782,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, int quest_num[]); -extern void do_cmd_knowledge_quests_failed(FILE *fff, int quest_num[]); +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, 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); @@ -792,7 +792,7 @@ extern void do_cmd_checkquest(void); extern void do_cmd_time(void); /* cmd5.c */ -extern cptr spell_category_name(int tval); +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); @@ -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(int realm, int spell, int mode); +extern cptr do_spell(REALM_IDX realm, SPELL_IDX spell, int mode); /* dungeon.c */ extern void leave_quest_check(void); @@ -920,32 +920,32 @@ extern bool load_floor(saved_floor_type *sf_ptr, u32b mode); /* melee1.c */ /* melee2.c */ -extern bool make_attack_normal(IDX m_idx); +extern bool make_attack_normal(MONSTER_IDX m_idx); extern void process_monsters(void); -extern int get_mproc_idx(int m_idx, int mproc_type); +extern int get_mproc_idx(MONSTER_IDX 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 bool set_monster_csleep(MONSTER_IDX m_idx, int v); +extern bool set_monster_fast(MONSTER_IDX m_idx, int v); +extern bool set_monster_slow(MONSTER_IDX m_idx, int v); +extern bool set_monster_stunned(MONSTER_IDX m_idx, int v); +extern bool set_monster_confused(MONSTER_IDX m_idx, int v); +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(int m_idx); +extern void dispel_monster_status(MONSTER_IDX 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); +extern void mon_take_hit_mon(MONSTER_IDX m_idx, HIT_POINT dam, bool *fear, cptr note, IDX who); extern bool process_the_world(int num, int who, bool vs_player); -extern void monster_gain_exp(int m_idx, int s_idx); +extern void monster_gain_exp(MONSTER_IDX m_idx, IDX s_idx); /* monster1.c */ -extern void roff_top(int r_idx); -extern void screen_roff(int r_idx, int mode); -extern void display_roff(int r_idx); -extern void output_monster_spoiler(int r_idx, void (*roff_func)(byte attr, cptr str)); +extern void roff_top(MONRACE_IDX r_idx); +extern void screen_roff(MONRACE_IDX r_idx, int 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); -extern bool mon_hook_dungeon(int r_idx); +extern bool mon_hook_dungeon(MONRACE_IDX r_idx); extern monster_hook_type get_monster_hook(void); extern monster_hook_type get_monster_hook2(int y, int x); @@ -958,7 +958,7 @@ extern bool monster_can_enter(int y, int x, monster_race *r_ptr, u16b mode); extern bool are_enemies(monster_type *m_ptr1, monster_type *m_ptr2); extern bool monster_has_hostile_align(monster_type *m_ptr, int pa_good, int pa_evil, monster_race *r_ptr); extern bool monster_living(monster_race *r_ptr); -extern bool no_questor_or_bounty_uniques(int r_idx); +extern bool no_questor_or_bounty_uniques(MONRACE_IDX r_idx); extern void dice_to_string(int base_damage, int dice_num, int dice_side, int dice_mult, int dice_div, char* msg); @@ -969,29 +969,29 @@ extern cptr funny_comments[MAX_SAN_COMMENT]; extern void set_target(monster_type *m_ptr, int y, int x); extern void reset_target(monster_type *m_ptr); extern monster_race *real_r_ptr(monster_type *m_ptr); -extern void delete_monster_idx(int i); -extern void delete_monster(int y, int x); +extern void delete_monster_idx(MONSTER_IDX i); +extern void delete_monster(POSITION y, POSITION x); extern void compact_monsters(int size); extern void wipe_m_list(void); -extern s16b m_pop(void); +extern MONSTER_IDX m_pop(void); extern errr get_mon_num_prep(monster_hook_type monster_hook, monster_hook_type monster_hook2); -extern s16b get_mon_num(int level); +extern MONRACE_IDX get_mon_num(DEPTH level); extern void monster_desc(char *desc, monster_type *m_ptr, int mode); -extern int lore_do_probe(int r_idx); -extern void lore_treasure(int m_idx, int num_item, int num_gold); +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 sanity_blast(monster_type *m_ptr, bool necro); -extern void update_mon(int m_idx, bool full); +extern void update_mon(MONSTER_IDX m_idx, bool full); 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 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(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); -extern bool multiply_monster(int m_idx, bool clone, u32b mode); -extern void update_smart_learn(int m_idx, int what); -extern void choose_new_monster(IDX m_idx, bool born, IDX r_idx); +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 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); extern bool player_place(POSITION y, POSITION x); extern void monster_drop_carried_objects(monster_type *m_ptr); @@ -1005,20 +1005,20 @@ 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 char index_to_label(int i); -extern s16b label_to_inven(int c); -extern s16b label_to_equip(int c); +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 bool check_book_realm(const byte book_tval, const byte book_sval); +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 int show_inven(int target_item); -extern int show_equip(int target_item); +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(int *cp, cptr pmt, cptr str, int mode); +extern bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, int mode); /* object2.c */ extern void excise_object_idx(int o_idx); @@ -1041,11 +1041,11 @@ 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 IDX lookup_kind(OBJECT_TYPE_VALUE tval, OBJECT_SUBTYPE_VALUE sval); extern void object_wipe(object_type *o_ptr); -extern void object_prep(object_type *o_ptr, IDX k_idx); +extern void object_prep(object_type *o_ptr, OBJECT_IDX k_idx); extern void object_copy(object_type *o_ptr, object_type *j_ptr); -extern void apply_magic(object_type *o_ptr, int lev, u32b mode); -extern bool make_object(object_type *j_ptr, u32b mode); -extern void place_object(int y, int x, u32b mode); +extern void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode); +extern bool make_object(object_type *j_ptr, BIT_FLAGS mode); +extern void place_object(POSITION y, POSITION x, BIT_FLAGS mode); extern bool make_gold(object_type *j_ptr); extern void place_gold(POSITION y, POSITION x); extern s16b drop_near(object_type *o_ptr, int chance, int y, int x); @@ -1070,7 +1070,7 @@ extern s16b inven_takeoff(int item, int amt); extern void inven_drop(int item, int amt); extern void combine_pack(void); extern void reorder_pack(void); -extern void display_koff(int k_idx); +extern void display_koff(IDX 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); @@ -1091,7 +1091,7 @@ extern bool save_floor(saved_floor_type *sf_ptr, u32b 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, byte *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int x2, int typ); +extern void breath_shape(u16b *path_g, int dist, int *pgrids, POSITION *gx, POSITION *gy, POSITION *gm, int *pgm_rad, int rad, int y1, int x1, int y2, int 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); @@ -1102,29 +1102,29 @@ extern bool binding_field(int dam); extern void seal_of_mirror(int dam); /* spells2.c */ -extern void message_pain(int m_idx, int dam); +extern void message_pain(MONSTER_IDX m_idx, int dam); extern void self_knowledge(void); -extern bool detect_traps(int range, bool known); -extern bool detect_doors(int range); -extern bool detect_stairs(int range); -extern bool detect_treasure(int range); -extern bool detect_objects_gold(int range); -extern bool detect_objects_normal(int range); -extern bool detect_objects_magic(int range); -extern bool detect_monsters_normal(int range); -extern bool detect_monsters_invis(int range); -extern bool detect_monsters_evil(int range); -extern bool detect_monsters_xxx(int range, u32b match_flag); -extern bool detect_monsters_string(int range, cptr); -extern bool detect_monsters_nonliving(int range); -extern bool detect_monsters_mind(int range); -extern bool detect_all(int range); +extern bool detect_traps(POSITION range, bool known); +extern bool detect_doors(POSITION range); +extern bool detect_stairs(POSITION range); +extern bool detect_treasure(POSITION range); +extern bool detect_objects_gold(POSITION range); +extern bool detect_objects_normal(POSITION range); +extern bool detect_objects_magic(POSITION range); +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_nonliving(POSITION range); +extern bool detect_monsters_mind(POSITION range); +extern bool detect_all(POSITION range); extern bool wall_stone(void); extern bool speed_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 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 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); @@ -1139,7 +1139,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_aux(int cy, int cx, int r, MONSTER_IDX 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); @@ -1182,8 +1182,8 @@ 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); -extern int activate_hi_summon(int y, int x, bool can_pet); -extern int summon_cyber(int who, int y, int x); +extern int activate_hi_summon(POSITION y, POSITION x, bool can_pet); +extern int summon_cyber(MONSTER_IDX who, POSITION y, POSITION x); extern void wall_breaker(void); extern bool confuse_monsters(int dam); extern bool charm_monsters(int dam); @@ -1213,17 +1213,17 @@ extern bool rush_attack(bool *mdeath); extern void remove_all_mirrors(bool explode); /* spells3.c */ -extern bool teleport_away(IDX m_idx, int dis, u32b mode); -extern void teleport_monster_to(IDX m_idx, POSITION ty, POSITION tx, int power, u32b mode); +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 void teleport_player_away(int m_idx, int dis); +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_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); +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); @@ -1259,7 +1259,7 @@ 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 bool spell_okay(int spell, bool learned, bool study_pray, int realm); -extern void print_spells(int target_spell, byte *spells, int num, int y, int x, 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); extern bool hates_elec(object_type *o_ptr); extern bool hates_fire(object_type *o_ptr); @@ -1278,7 +1278,7 @@ 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 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); @@ -1293,7 +1293,7 @@ extern void store_init(int town_num, int store_num); extern void move_to_black_market(object_type * o_ptr); /* bldg.c */ -extern bool get_nightmare(int r_idx); +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); @@ -1301,9 +1301,9 @@ extern void quest_discovery(int q_idx); extern IDX quest_number(DEPTH level); extern IDX random_quest_number(DEPTH level); extern bool tele_town(void); -extern s16b calc_crit_ratio_shot(int plus_ammo,int plus_bow); -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); +extern HIT_POINT calc_crit_ratio_shot(HIT_POINT plus_ammo, HIT_POINT plus_bow); +extern HIT_POINT calc_expect_crit_shot(int weight, int plus_ammo,int plus_bow, int dam); +extern HIT_POINT 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); @@ -1335,7 +1335,7 @@ 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 char inkey(void); -extern cptr quark_str(s16b num); +extern cptr quark_str(STR_OFFSET num); extern void quark_init(void); extern s16b quark_add(cptr str); extern s32b message_num(void); @@ -1362,7 +1362,7 @@ 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_com(cptr prompt, char *command, bool z_escape); -extern s16b get_quantity(cptr prompt, int max); +extern s16b get_quantity(cptr prompt, COMMAND_CODE max); extern void pause_line(int row); extern void request_command(int shopping); extern bool is_a_vowel(int ch); @@ -1488,8 +1488,8 @@ 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); +extern void monster_death(MONSTER_IDX m_idx, bool drop_item); +extern bool mon_take_hit(MONSTER_IDX m_idx, int dam, bool *fear, cptr note); extern void get_screen_size(int *wid_p, int *hgt_p); extern void panel_bounds_center(void); extern void resize_map(void); @@ -1499,11 +1499,11 @@ extern void verify_panel(void); extern cptr look_mon_desc(monster_type *m_ptr, u32b 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(int m_idx); +extern bool target_able(MONSTER_IDX m_idx); extern bool target_okay(void); extern bool target_set(int mode); extern void target_set_prepare_look(void); -extern bool get_aim_dir(int *dp); +extern bool get_aim_dir(DIRECTION *dp); extern bool get_hack_dir(int *dp); extern bool get_rep_dir(int *dp, bool under); extern bool get_rep_dir2(int *dp); @@ -1513,8 +1513,8 @@ 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 s16b bow_energy(int sval); -extern int bow_tmul(int sval); +extern s16b 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); @@ -1563,27 +1563,16 @@ extern bool do_cmd_mane(bool baigaesi); 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); -extern void beam(int m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type); -extern void bolt(int m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type); -extern void breath(int y, int x, int m_idx, int typ, int dam_hp, int rad, bool breath, int monspell, int target_type); - -/* mspells1.c */ -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(IDX m_idx); -extern bool spell_is_inate(u16b spell); -extern bool make_attack_spell(IDX m_idx); -extern void beam(int m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type); -extern void bolt(int m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type); -extern void breath(int y, int x, int m_idx, int typ, int dam_hp, int rad, bool breath, int monspell, int target_type); +extern bool dispel_check(MONSTER_IDX m_idx); +extern bool spell_is_inate(SPELL_IDX spell); +extern bool make_attack_spell(MONSTER_IDX m_idx); +extern void beam(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type); +extern void bolt(MONSTER_IDX m_idx, int y, int x, int typ, int dam_hp, int monspell, int target_type); +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 bool monst_spell_monst(IDX m_idx); +extern bool monst_spell_monst(MONSTER_IDX m_idx); /* mspells3.c */ extern bool do_cmd_cast_learned(void); @@ -1591,11 +1580,11 @@ extern void learn_spell(int monspell); extern void set_rf_masks(s32b *f4, s32b *f5, s32b *f6, int mode); /* mspells4.c */ -extern bool spell_learnable(int m_idx); -extern int monspell_to_player(int SPELL_NUM, POSITION y, POSITION x, IDX m_idx); -extern int monspell_to_monster(int SPELL_NUM, POSITION y, POSITION x, IDX m_idx, IDX t_idx); -extern int monspell_damage(int SPELL_NUM, int m_idx, int TYPE); -extern int monspell_race_damage(int SPELL_NUM, int r_idx, int TYPE); +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); /* hissatsu.c */ @@ -1664,8 +1653,8 @@ extern void fsetfileinfo(cptr path, u32b fcreator, u32b ftype); #ifdef ALLOW_REPEAT /* TNB */ /* util.c */ -extern void repeat_push(int what); -extern bool repeat_pull(int *what); +extern void repeat_push(COMMAND_CODE what); +extern bool repeat_pull(COMMAND_CODE *what); extern void repeat_check(void); #endif /* ALLOW_REPEAT -- TNB */ @@ -1696,7 +1685,7 @@ extern bool do_cmd_disarm_aux(int y, int x, int dir); /* object1.c */ extern int scan_floor(int *items, int y, int x, int mode); extern int show_floor(int target_item, int y, int x, int *min_width); -extern bool get_item_floor(int *cp, cptr pmt, cptr str, int mode); +extern bool get_item_floor(COMMAND_CODE *cp, cptr pmt, cptr str, int mode); extern void py_pickup_floor(bool pickup); /* variable.c */ @@ -1727,7 +1716,7 @@ extern bool object_is_nameless(object_type *o_ptr); extern bool object_allow_two_hands_wielding(object_type *o_ptr); /* wild.c */ -extern void set_floor_and_wall(byte type); +extern void set_floor_and_wall(DUNGEON_IDX type); extern void wilderness_gen(void); extern void wilderness_gen_small(void); extern errr init_wilderness(void); @@ -1817,6 +1806,6 @@ extern void check_hex(void); extern bool hex_spell_fully(void); extern void revenge_spell(void); 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); +extern bool teleport_barrier(MONSTER_IDX m_idx); +extern bool magic_barrier(MONSTER_IDX m_idx); +extern bool multiply_barrier(MONSTER_IDX m_idx);