X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=9d41563c273ebb17c430cebeba81257833bd106e;hb=d79b09a0345480907b83877141057d346b0d172e;hp=df49b76e12e956f68bf61a3947958bc5f9a6b9e0;hpb=23e6a6596c95de7036e6fb2b985faa350d361c7c;p=hengband%2Fhengband.git diff --git a/src/externs.h b/src/externs.h index df49b76e1..9d41563c2 100644 --- a/src/externs.h +++ b/src/externs.h @@ -258,10 +258,10 @@ extern u32b message__head; extern u32b message__tail; extern u32b *message__ptr; extern char *message__buf; -extern u32b option_flag[8]; -extern u32b option_mask[8]; -extern u32b window_flag[8]; -extern u32b window_mask[8]; +extern BIT_FLAGS option_flag[8]; +extern BIT_FLAGS option_mask[8]; +extern BIT_FLAGS window_flag[8]; +extern BIT_FLAGS window_mask[8]; extern term *angband_term[8]; extern const char angband_term_name[8][16]; extern byte angband_color_table[256][4]; @@ -333,14 +333,12 @@ 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 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); -extern monster_hook_type get_mon_num_hook; -extern monster_hook_type get_mon_num2_hook; +extern monsterrace_hook_type get_mon_num_hook; +extern monsterrace_hook_type get_mon_num2_hook; extern bool (*get_obj_num_hook)(KIND_OBJECT_IDX k_idx); extern bool monk_armour_aux; extern bool monk_notify_aux; @@ -385,7 +383,6 @@ extern MONRACE_IDX today_mon; extern bool write_level; extern u32b playtime; extern u32b start_time; -extern int tsuri_dir; extern bool sukekaku; extern bool new_mane; extern bool mon_fight; @@ -429,6 +426,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; @@ -479,7 +484,7 @@ extern void update_local_illumination(POSITION y, POSITION x); extern bool player_can_see_bold(POSITION y, POSITION x); extern bool cave_valid_bold(POSITION y, POSITION x); extern bool no_lite(void); -extern void apply_default_feat_lighting(TERM_COLOR f_attr[F_LIT_MAX], byte f_char[F_LIT_MAX]); +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); @@ -504,8 +509,8 @@ 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, FEAT_IDX feat); -extern IDX conv_dungeon_feat(IDX newfeat); -extern IDX feat_state(IDX feat, int action); +extern FEAT_IDX conv_dungeon_feat(FEAT_IDX newfeat); +extern FEAT_IDX feat_state(IDX feat, int action); extern void cave_alter_feat(POSITION y, POSITION x, int action); extern void remove_mirror(POSITION y, POSITION x); extern bool is_mirror_grid(cave_type *c_ptr); @@ -517,22 +522,21 @@ extern void scatter(POSITION *yp, POSITION *xp, POSITION y, POSITION x, POSITION extern void health_track(MONSTER_IDX m_idx); extern void monster_race_track(MONRACE_IDX r_idx); extern void object_kind_track(KIND_OBJECT_IDX k_idx); -extern void disturb(int stop_search, int flush_output); +extern void disturb(bool stop_search, bool flush_output); extern void glow_deep_lava_and_bldg(void); extern bool cave_monster_teleportable_bold(MONSTER_IDX m_idx, POSITION y, POSITION x, BIT_FLAGS mode); extern bool cave_player_teleportable_bold(POSITION y, POSITION x, BIT_FLAGS mode); /* 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 s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, BIT_FLAGS mode, bool thrown); +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(int feat); +extern bool trap_can_be_ignored(FEAT_IDX feat); extern void move_player(DIRECTION dir, bool do_pickup, bool break_trap); extern void run_step(DIRECTION dir); #ifdef TRAVEL @@ -621,7 +625,7 @@ extern void prevent_turn_overflow(void); extern void safe_setuid_drop(void); extern void safe_setuid_grab(void); extern s16b tokenize(char *buf, s16b num, char **tokens, BIT_FLAGS mode); -extern void display_player(BIT_FLAGS mode); +extern void display_player(int mode); extern errr make_character_dump(FILE *fff); extern errr file_character(cptr name); extern errr process_pref_file_command(char *buf); @@ -669,7 +673,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); @@ -698,12 +702,8 @@ extern cptr get_check_sum(void); 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); @@ -717,9 +717,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 u32b get_curse(int power, object_type *o_ptr); -extern void curse_equipment(int chance, int heavy_chance); -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, cptr 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); @@ -727,21 +725,19 @@ 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, cptr str)); extern void create_name(int type, char *name); -extern monster_hook_type get_monster_hook(void); -extern monster_hook_type get_monster_hook2(POSITION y, POSITION x); +extern monsterrace_hook_type get_monster_hook(void); +extern monsterrace_hook_type get_monster_hook2(POSITION y, POSITION x); extern void set_friendly(monster_type *m_ptr); extern void set_pet(monster_type *m_ptr); extern void set_hostile(monster_type *m_ptr); extern void anger_monster(monster_type *m_ptr); -extern bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, u16b mode); -extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, u16b mode); +extern bool monster_can_cross_terrain(FEAT_IDX feat, monster_race *r_ptr, BIT_FLAGS16 mode); +extern bool monster_can_enter(POSITION y, POSITION x, monster_race *r_ptr, BIT_FLAGS16 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(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); @@ -752,25 +748,26 @@ extern cptr 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); +extern MONRACE_IDX real_r_idx(monster_type *m_ptr); 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 MONSTER_IDX m_pop(void); -extern errr get_mon_num_prep(monster_hook_type monster_hook, monster_hook_type monster_hook2); +extern errr get_mon_num_prep(monsterrace_hook_type monster_hook, monsterrace_hook_type monster_hook2); extern MONRACE_IDX get_mon_num(DEPTH level); 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, 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_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_specific(MONSTER_IDX who, POSITION y1, POSITION x1, DEPTH lev, int type, BIT_FLAGS mode, SYMBOL_CODE symbol); 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); @@ -797,11 +794,12 @@ extern bool check_book_realm(const OBJECT_TYPE_VALUE book_tval, const OBJECT_SUB 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 object_type *choose_object(OBJECT_IDX *idx, cptr q, cptr s, BIT_FLAGS option); /* object2.c */ extern void excise_object_idx(OBJECT_IDX o_idx); @@ -838,11 +836,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); @@ -853,10 +851,10 @@ extern void combine_pack(void); extern void reorder_pack(void); extern void display_koff(KIND_OBJECT_IDX k_idx); extern object_type *choose_warning_item(void); -extern bool process_warning(int xx, int yy); +extern bool process_warning(POSITION xx, POSITION yy); extern void do_cmd_kaji(bool only_browse); -extern void torch_flags(object_type *o_ptr, u32b *flgs); -extern void torch_dice(object_type *o_ptr, int *dd, int *ds); +extern void torch_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[]; @@ -932,7 +930,7 @@ extern bool fire_rocket(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION ra extern bool fire_ball_hide(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam, POSITION rad); extern bool fire_meteor(MONSTER_IDX who, EFFECT_ID typ, POSITION x, POSITION y, HIT_POINT dam, POSITION rad); extern bool fire_bolt(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam); -extern bool fire_blast(EFFECT_ID typ, DIRECTION dir, int dd, int ds, int num, int dev); +extern bool fire_blast(EFFECT_ID typ, DIRECTION dir, DICE_NUMBER dd, DICE_SID ds, int num, int dev); extern void call_chaos(void); extern bool fire_beam(EFFECT_ID typ, DIRECTION dir, HIT_POINT dam); extern bool fire_bolt_or_beam(PERCENTAGE prob, EFFECT_ID typ, DIRECTION dir, HIT_POINT dam); @@ -984,7 +982,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); @@ -1021,8 +1019,8 @@ 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 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); @@ -1051,26 +1049,13 @@ extern bool bless_weapon(void); extern bool pulish_shield(void); extern bool potion_smash_effect(MONSTER_IDX who, POSITION y, POSITION x, KIND_OBJECT_IDX k_idx); extern void display_spell_list(void); -extern s16b experience_of_spell(int spell, int realm); -extern int mod_need_mana(int need_mana, int spell, int realm); +extern EXP experience_of_spell(SPELL_IDX spell, REALM_IDX use_realm); +extern MANA_POINT mod_need_mana(MANA_POINT need_mana, SPELL_IDX spell, REALM_IDX realm); extern PERCENTAGE mod_spell_chance_1(PERCENTAGE chance); extern PERCENTAGE mod_spell_chance_2(PERCENTAGE chance); extern PERCENTAGE spell_chance(SPELL_IDX spell, REALM_IDX realm); extern bool spell_okay(int spell, bool learned, bool study_pray, int realm); extern void print_spells(SPELL_IDX target_spell, SPELL_IDX *spells, int num, TERM_LEN y, TERM_LEN x, REALM_IDX realm); -extern bool hates_acid(object_type *o_ptr); -extern bool hates_elec(object_type *o_ptr); -extern bool hates_fire(object_type *o_ptr); -extern bool hates_cold(object_type *o_ptr); -extern int set_acid_destroy(object_type *o_ptr); -extern int set_elec_destroy(object_type *o_ptr); -extern int set_fire_destroy(object_type *o_ptr); -extern int set_cold_destroy(object_type *o_ptr); -extern int inven_damage(inven_func typ, int perc); -extern int acid_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura); -extern int elec_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura); -extern int fire_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura); -extern int cold_dam(HIT_POINT dam, cptr kb_str, int monspell, bool aura); extern bool rustproof(void); extern bool curse_armor(void); extern bool curse_weapon_object(bool force, object_type *o_ptr); @@ -1079,20 +1064,11 @@ 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); - -/* store.c */ -extern bool combine_and_reorder_home(int store_num); -extern void do_cmd_store(void); -extern void store_shuffle(int which); -extern void store_maint(int town_num, int store_num); -extern void store_init(int town_num, int store_num); -extern void move_to_black_market(object_type * o_ptr); +extern bool shock_power(void); /* 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); @@ -1140,6 +1116,7 @@ extern u16b quark_add(cptr str); extern s32b message_num(void); extern cptr message_str(int age); extern void message_add(cptr msg); +extern void msg_erase(void); extern void msg_print(cptr msg); extern void msg_print_wizard(int cheat_type, cptr msg); #ifndef SWIG @@ -1148,11 +1125,11 @@ extern void msg_format_wizard(int cheat_type, cptr 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 c_put_str(TERM_COLOR attr, cptr str, TERM_LEN row, TERM_LEN col); +extern void put_str(cptr str, TERM_LEN row, TERM_LEN col); +extern void c_prt(TERM_COLOR attr, cptr str, TERM_LEN row, TERM_LEN col); +extern void prt(cptr str, TERM_LEN row, TERM_LEN col); +extern void c_roff(TERM_COLOR attr, cptr str); extern void roff(cptr str); extern void clear_from(int row); extern bool askfor_aux(char *buf, int len, bool numpad_cursor); @@ -1178,10 +1155,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, cptr src, size_t bufsize); +extern size_t my_strcat(char *buf, cptr src, size_t bufsize); +extern char *my_strstr(cptr haystack, cptr needle); +extern char *my_strchr(cptr ptr, char ch); extern void str_tolower(char *str); extern int inkey_special(bool numpad_cursor); @@ -1189,8 +1166,6 @@ 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); @@ -1199,12 +1174,10 @@ extern bool is_heavy_shoot(object_type *o_ptr); extern int bow_tval_ammo(object_type *o_ptr); extern s16b calc_num_fire(object_type *o_ptr); extern void calc_bonuses(void); -extern void notice_stuff(void); -extern void update_stuff(void); -extern void redraw_stuff(void); -extern void window_stuff(void); extern void handle_stuff(void); -extern s16b empty_hands(bool riding_control); +extern void update_output(void); +extern void update_creature(player_type *creature_ptr); +extern BIT_FLAGS16 empty_hands(bool riding_control); extern bool heavy_armor(void); extern void print_monster_list(TERM_LEN x, TERM_LEN y, TERM_LEN max_lines); extern void update_playtime(void); @@ -1286,7 +1259,7 @@ 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(monster_race *r_ptr); +extern cptr 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); @@ -1304,20 +1277,15 @@ 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); +extern bool get_direction(DIRECTION *dp, bool allow_under, bool with_steed); extern bool get_rep_dir(DIRECTION *dp, bool under); -extern bool get_rep_dir2(DIRECTION *dp); 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 */ @@ -1356,8 +1324,8 @@ extern void do_cmd_mind_browse(void); extern bool do_cmd_mane(bool baigaesi); /* 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 clean_shot(POSITION y1, POSITION x1, POSITION y2, POSITION x2, bool is_friend); +extern bool summon_possible(POSITION y1, POSITION x1); extern bool raise_possible(monster_type *m_ptr); extern bool dispel_check(MONSTER_IDX m_idx); extern bool spell_is_inate(SPELL_IDX spell); @@ -1367,13 +1335,13 @@ extern void bolt(MONSTER_IDX m_idx, POSITION y, POSITION x, EFFECT_ID typ, int d extern void breath(POSITION y, POSITION x, MONSTER_IDX m_idx, EFFECT_ID typ, int dam_hp, POSITION rad, bool breath, int monspell, int target_type); /* mspells2.c */ -extern void get_project_point(int sy, int sx, int *ty, int *tx, BIT_FLAGS flg); +extern void get_project_point(POSITION sy, POSITION sx, POSITION *ty, POSITION *tx, BIT_FLAGS flg); extern bool monst_spell_monst(MONSTER_IDX m_idx); /* mspells3.c */ 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); @@ -1443,39 +1411,23 @@ extern void fsetfileinfo(cptr path, u32b fcreator, u32b ftype); /* extern int FAR PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, ...); */ #endif - -#ifdef ALLOW_REPEAT /* TNB */ - /* util.c */ extern void repeat_push(COMMAND_CODE what); extern bool repeat_pull(COMMAND_CODE *what); extern void repeat_check(void); -#endif /* ALLOW_REPEAT -- TNB */ - -#ifdef ALLOW_EASY_OPEN /* TNB */ - /* variable.c */ extern bool easy_open; /* cmd2.c */ extern bool easy_open_door(POSITION y, POSITION x); -#endif /* ALLOW_EASY_OPEN -- TNB */ - -#ifdef ALLOW_EASY_DISARM /* TNB */ - /* variable.c */ extern bool easy_disarm; /* cmd2.c */ extern bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir); -#endif /* ALLOW_EASY_DISARM -- TNB */ - - -#ifdef ALLOW_EASY_FLOOR /* TNB */ - /* object1.c */ extern ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode); extern COMMAND_CODE show_floor(int target_item, POSITION y, POSITION x, TERM_LEN *min_width); @@ -1485,8 +1437,6 @@ extern void py_pickup_floor(bool pickup); /* variable.c */ extern bool easy_floor; -#endif /* ALLOW_EASY_FLOOR -- TNB */ - /* obj_kind.c */ extern bool object_is_potion(object_type *o_ptr); extern bool object_is_shoukinkubi(object_type *o_ptr); @@ -1526,6 +1476,7 @@ extern void spoil_random_artifact(cptr fname); 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); @@ -1538,8 +1489,8 @@ 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, cptr sindarin); +extern void jverb( cptr in , char *out , int flag); extern void sjis2euc(char *str); extern void euc2sjis(char *str); extern byte codeconv(char *str); @@ -1557,7 +1508,7 @@ extern cptr make_screen_dump(void); 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, cptr host, int port); extern int disconnect_server(int sd); extern cptr soc_err(void);