X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fexterns.h;h=cad74e5b8ecbc45dbaec99d10a878d5b0028bd33;hb=7bdabc50285d97192a7cd286ebf825c2329b9235;hp=735bf15013cc7ed078c9f9bbadc21481b28497bc;hpb=a517fa121ef6138a9f94f0e337efd00658fee433;p=hengband%2Fhengband.git

diff --git a/src/externs.h b/src/externs.h
index 735bf1501..cad74e5b8 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -220,7 +220,7 @@ extern bool closing_flag;
 extern POSITION panel_row_min, panel_row_max;
 extern POSITION panel_col_min, panel_col_max;
 extern POSITION panel_col_prt, panel_row_prt;
-extern IDX target_who;
+extern MONSTER_IDX target_who;
 extern POSITION target_col;
 extern POSITION target_row;
 extern int player_uid;
@@ -268,7 +268,7 @@ extern const concptr angband_sound_name[SOUND_MAX];
 extern const concptr angband_music_basic_name[MUSIC_BASIC_MAX];
 extern cave_type *cave[MAX_HGT];
 extern saved_floor_type saved_floors[MAX_SAVED_FLOORS];
-extern s16b max_floor_id;
+extern FLOOR_IDX max_floor_id;
 extern u32b saved_floor_file_sign;
 extern object_type *o_list;
 extern monster_type *m_list;
@@ -523,6 +523,7 @@ 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);
+extern bool is_open(FEAT_IDX feat);
 
 /* cmd1.c */
 extern HIT_POINT critical_shot(WEIGHT weight, int plus_ammo, int plus_bow, HIT_POINT dam);
@@ -541,6 +542,7 @@ extern void travel_step(void);
 #endif
 
 /* cmd2.c */
+extern bool cmd_limit_arena(player_type *creature_ptr);
 extern void forget_travel_flow(void);
 extern bool confirm_leave_level(bool down_stair);
 extern void do_cmd_go_up(void);
@@ -596,14 +598,7 @@ extern void plural_aux(char * Name);
 extern void do_cmd_checkquest(void);
 extern void do_cmd_time(void);
 
-/* cmd5.c */
-extern concptr 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);
-
 /* cmd-spell.c */
-extern void stop_singing(void);
 extern concptr 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);
 
@@ -869,6 +864,7 @@ extern bool project(MONSTER_IDX who, POSITION rad, POSITION y, POSITION x, HIT_P
 extern int project_length;
 extern bool binding_field(HIT_POINT dam);
 extern void seal_of_mirror(HIT_POINT dam);
+extern concptr spell_category_name(OBJECT_TYPE_VALUE tval);
 
 /* spells2.c */
 extern void message_pain(MONSTER_IDX m_idx, HIT_POINT dam);
@@ -1002,6 +998,7 @@ extern bool sword_dancing(player_type *creature_ptr);
 extern bool confusing_light(player_type *creature_ptr);
 extern bool rodeo(player_type *creature_ptr);
 extern bool clear_mind(player_type *creature_ptr);
+extern bool concentration(player_type *creature_ptr);
 
 /* spells3.c */
 extern bool teleport_away(MONSTER_IDX m_idx, POSITION dis, BIT_FLAGS mode);
@@ -1241,15 +1238,18 @@ extern bool set_wraith_form(TIME_EFFECT v, bool do_dec);
 extern bool set_tim_esp(TIME_EFFECT v, bool do_dec);
 extern bool set_superstealth(bool set);
 
+/* view-mainwindow.c */
+extern void resize_map(void);
+extern void redraw_window(void);
+extern bool change_panel(POSITION dy, POSITION dx);
+
+
 /* xtra2.c */
 extern void check_experience(void);
 extern concptr extract_note_dies(MONRACE_IDX r_idx);
 extern void monster_death(MONSTER_IDX m_idx, bool drop_item);
 extern void get_screen_size(TERM_LEN *wid_p, TERM_LEN *hgt_p);
 extern void panel_bounds_center(void);
-extern void resize_map(void);
-extern void redraw_window(void);
-extern bool change_panel(POSITION dy, POSITION dx);
 extern void verify_panel(void);
 extern concptr look_mon_desc(monster_type *m_ptr, BIT_FLAGS mode);
 extern bool target_able(MONSTER_IDX m_idx);
@@ -1263,9 +1263,6 @@ extern bool get_rep_dir(DIRECTION *dp, bool under);
 extern bool tgt_pt(POSITION *x, POSITION *y);
 extern void do_poly_wounds(void);
 extern void change_race(CHARACTER_IDX new_race, concptr effect_msg);
-extern ENERGY bow_energy(OBJECT_SUBTYPE_VALUE sval);
-extern int bow_tmul(OBJECT_SUBTYPE_VALUE sval);
-extern void display_rumor(bool ex);
 
 /* scores.c */
 extern void display_scores_aux(int from, int to, int note, high_score *score);
@@ -1494,18 +1491,8 @@ extern void do_cmd_snipe(void);
 extern void do_cmd_snipe_browse(void);
 extern int boost_concentration_damage(int tdam);
 
-/* hex.c */
-extern bool stop_hex_spell_all(void);
-extern bool stop_hex_spell(void);
-extern void check_hex(void);
-extern bool hex_spell_fully(void);
-extern void revenge_spell(void);
-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(INVENTORY_IDX 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);
+