X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=52d5d74d8b3762110d42c799a6c14edfbb5cd8bb;hb=809f285c4a153afcad25d9462cd24f996ed54e6b;hp=6047a28d09bb87d107993d4af2c8be45c6a7f6e7;hpb=639a9f73510d03e7d815d71be36cf80f2d0a6afc;p=hengband%2Fhengband.git

diff --git a/src/externs.h b/src/externs.h
index 6047a28d0..52d5d74d8 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -93,7 +93,6 @@ 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 option_type option_info[];
 extern const cptr chaos_patrons[MAX_PATRON];
 extern const int chaos_stats[MAX_PATRON];
 extern const int chaos_rewards[MAX_PATRON][20];
@@ -116,6 +115,10 @@ extern const dragonbreath_type dragonbreath_info[];
 extern const activation_type activation_info[];
 extern const cptr 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 byte h_ver_major;
@@ -383,6 +386,7 @@ extern bool cheat_live;
 extern bool cheat_save;
 extern bool cheat_diary_output;
 extern bool cheat_turn;
+extern bool cheat_sight;
 
 extern char record_o_name[MAX_NLEN];
 extern s32b record_turn;
@@ -696,15 +700,12 @@ extern void disturb(int stop_search, int flush_output);
 extern void glow_deep_lava_and_bldg(void);
 
 /* cmd1.c */
-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, 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, 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);
@@ -734,32 +735,11 @@ extern void do_cmd_run(void);
 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, OBJECT_IDX shuriken);
+extern bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken);
 #ifdef TRAVEL
 extern void do_cmd_travel(void);
 #endif
 
-/* cmd3.c */
-extern void do_cmd_inven(void);
-extern void do_cmd_equip(void);
-extern void do_cmd_wield(void);
-extern void do_cmd_takeoff(void);
-extern void do_cmd_drop(void);
-extern void do_cmd_destroy(void);
-extern void do_cmd_observe(void);
-extern void do_cmd_uninscribe(void);
-extern void do_cmd_inscribe(void);
-extern void do_cmd_refill(void);
-extern void do_cmd_target(void);
-extern void do_cmd_look(void);
-extern void do_cmd_locate(void);
-extern void do_cmd_query_symbol(void);
-extern void kamaenaoshi(int 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);
-extern void do_cmd_use(void);
-
 /* cmd4.c */
 #ifndef JP
 extern cptr get_ordinal_number_suffix(int num);
@@ -797,16 +777,11 @@ 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);
-extern bool rakuba(HIT_POINT dam, bool force);
-extern bool do_riding(bool force);
-extern void check_pets_num_and_align(monster_type *m_ptr, bool inc);
-extern int calculate_upkeep(void);
-extern void do_cmd_pet_dismiss(void);
-extern void do_cmd_pet(void);
-
-/* do-spell.c */
+
+/* cmd-spell.c */
 extern void stop_singing(void);
 extern cptr 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 */
 extern void leave_quest_check(void);
@@ -881,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);
@@ -907,6 +877,9 @@ extern bool load_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode);
 
 /* melee1.c */
 /* melee2.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(int y, int x, BIT_FLAGS mode);
 extern bool make_attack_normal(MONSTER_IDX m_idx);
 extern void process_monsters(void);
 extern int get_mproc_idx(MONSTER_IDX m_idx, int mproc_type);
@@ -932,16 +905,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);
@@ -973,7 +945,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);
@@ -1036,12 +1008,8 @@ 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 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);
@@ -1077,6 +1045,7 @@ extern void remove_loc(void);
 extern bool save_floor(saved_floor_type *sf_ptr, BIT_FLAGS mode);
 
 /* spells1.c */
+extern int 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, int typ);
 extern int take_hit(int damage_type, HIT_POINT damage, cptr kb_str, int monspell);
@@ -1188,7 +1157,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);
@@ -1198,6 +1166,12 @@ extern bool rush_attack(bool *mdeath);
 extern void remove_all_mirrors(bool explode);
 extern void ring_of_power(int dir);
 extern void wild_magic(int spell);
+extern void cast_meteor(HIT_POINT dam, int rad);
+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);
 
 /* spells3.c */
 extern bool teleport_away(MONSTER_IDX m_idx, int dis, BIT_FLAGS mode);
@@ -1797,3 +1771,8 @@ 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(int 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);