X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=a408f62458c7df87b60518e5421c2c84bb388e65;hb=65f1bf941932b6d02fdba31cfc3f95dea7ef3e6e;hp=61fc7c5d6c64a66f58a1cf528622f3944b47f7ce;hpb=0b80c44372cac40fda268094dcc5eae3f93837f5;p=hengband%2Fhengband.git diff --git a/src/externs.h b/src/externs.h index 61fc7c5d6..a408f6245 100644 --- a/src/externs.h +++ b/src/externs.h @@ -285,7 +285,7 @@ extern bool ignore_unview; /* Ignore whenever any monster does */ extern bool show_ammo_detail; /* Show Description of ammo damage */ extern bool show_ammo_no_crit; /* Show No-crit damage of ammo */ extern bool show_ammo_crit_ratio; /* Show critical ratio of ammo */ - +extern bool show_actual_value; /* Show actual value of skill */ /*** Game-Play Options ***/ @@ -530,7 +530,7 @@ 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 ARTIFACT_IDX max_a_idx; extern IDX max_e_idx; extern DUNGEON_IDX max_d_idx; extern OBJECT_IDX max_o_idx; @@ -706,7 +706,6 @@ extern s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, BIT_F 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, 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); @@ -791,11 +790,11 @@ extern void extract_option_vars(void); extern void determine_bounty_uniques(void); extern void determine_today_mon(bool conv_old); extern void play_game(bool new_game); -extern bool psychometry(void); -extern void leave_level(int level); -extern void enter_level(int level); extern s32b turn_real(s32b hoge); extern void prevent_turn_overflow(void); +extern byte value_check_aux1(object_type *o_ptr); +extern byte value_check_aux2(object_type *o_ptr); + /* files.c */ @@ -857,11 +856,6 @@ extern void leave_floor(void); extern void change_floor(void); extern void stair_creation(void); -/* generate.c */ -extern bool place_quest_monsters(void); -extern void wipe_generate_cave_flags(void); -extern void clear_cave(void); -extern void generate_cave(void); /* init1.c */ extern byte color_char_to_attr(char c); @@ -882,11 +876,13 @@ extern errr rd_savefile_new(void); extern bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode); /* melee1.c */ -/* melee2.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(int 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); extern void mproc_init(void); extern bool set_monster_csleep(MONSTER_IDX m_idx, int v); @@ -910,16 +906,15 @@ 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); -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); +extern monster_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(s16b feat, monster_race *r_ptr, u16b mode); -extern bool monster_can_enter(int y, int x, monster_race *r_ptr, u16b mode); +extern bool monster_can_enter(POSITION y, POSITION 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); @@ -951,7 +946,7 @@ 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, BIT_FLAGS mode); +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); @@ -1013,13 +1008,9 @@ 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); -extern void acquirement(int y1, int x1, int num, bool great, bool special, bool known); -extern void amusement(int y1, int x1, int num, bool known); -extern void init_normal_traps(void); -extern s16b choose_random_trap(void); -extern void disclose_grid(int y, int x); -extern void place_trap(int y, int x); +extern OBJECT_IDX drop_near(object_type *o_ptr, PERCENTAGE chance, POSITION y, POSITION x); +extern void acquirement(POSITION y1, POSITION x1, int num, bool great, bool special, bool known); +extern void amusement(POSITION y1, POSITION x1, int num, bool known); extern void inven_item_charges(int item); extern void inven_item_describe(int item); extern void inven_item_increase(int item, int num); @@ -1103,9 +1094,9 @@ extern bool dispel_living(HIT_POINT dam); extern bool dispel_demons(HIT_POINT 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, MONSTER_IDX m_idx); -extern bool earthquake(int cy, int cx, int r); +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(int y1, int x1); extern void unlite_room(int y1, int x1); extern bool lite_area(HIT_POINT dam, int rad); @@ -1167,7 +1158,6 @@ extern bool charm_animal(int dir, int plev); extern bool mindblast_monsters(HIT_POINT dam); extern s32b flag_cost(object_type *o_ptr, int plusses); 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, BIT_FLAGS flg); extern bool project_hack(int typ, HIT_POINT dam); extern bool eat_magic(int power); @@ -1182,6 +1172,19 @@ extern bool cast_wrath_of_the_god(HIT_POINT dam, int rad); extern void cast_wonder(int dir); extern void cast_invoke_spirits(int dir); extern void cast_shuffle(void); +extern bool_hack life_stream(bool_hack message, bool_hack virtue); +extern bool_hack heroism(int base); +extern bool_hack berserk(int base); +extern bool_hack cure_light_wounds(int dice, int sides); +extern bool_hack cure_serious_wounds(int dice, int sides); +extern bool_hack cure_critical_wounds(HIT_POINT pow); +extern bool_hack true_healing(HIT_POINT pow); +extern bool_hack restore_mana(bool_hack magic_eater); +extern bool restore_all_status(void); +extern void stop_mouth(void); +extern bool_hack vampirism(void); +extern bool panic_hit(void); +extern bool psychometry(void); /* spells3.c */ extern bool teleport_away(MONSTER_IDX m_idx, int dis, BIT_FLAGS mode); @@ -1505,7 +1508,7 @@ 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(int a_idx, int y, int x); +extern bool create_named_art(ARTIFACT_IDX a_idx, POSITION y, POSITION x); /* scores.c */ extern void display_scores_aux(int from, int to, int note, high_score *score);