move_player_effect()の処理をbitフラグで制御するように変更. また, プレ

[hengband/hengband.git] / src / externs.h

diff --git a/src/externs.h b/src/externs.h
index 56735a5..d22462f 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -295,7 +295,6 @@ extern bool send_score;     /* Send score dump to the world score server */
 #endif
 
 extern bool allow_debug_opts;  /* Allow use of debug/cheat options */
-extern bool autoload_pref_files;
 
 
 /*** Disturbance Options ***/
@@ -655,12 +654,12 @@ extern s16b critical_norm(int weight, int plus, int dam, s16b meichuu, int mode)
 extern s16b tot_dam_aux(object_type *o_ptr, int tdam, monster_type *m_ptr, int mode, bool thrown);
 extern void search(void);
 extern void py_pickup_aux(int o_idx);
-extern void carry(int pickup);
+extern void carry(bool pickup);
 extern bool py_attack(int y, int x, int 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 void move_player_effect(int do_pickup, bool break_trap);
-extern void move_player(int dir, int do_pickup, bool break_trap);
+extern bool move_player_effect(int oy, int ox, int ny, int nx, u32b mpe_mode);
+extern void move_player(int dir, bool do_pickup, bool break_trap);
 extern void run_step(int dir);
 
 /* cmd2.c */
@@ -674,8 +673,8 @@ extern void do_cmd_disarm(void);
 extern void do_cmd_bash(void);
 extern void do_cmd_alter(void);
 extern void do_cmd_spike(void);
-extern void do_cmd_walk(int pickup);
-extern void do_cmd_stay(int pickup);
+extern void do_cmd_walk(bool pickup);
+extern void do_cmd_stay(bool pickup);
 extern void do_cmd_run(void);
 extern void do_cmd_rest(void);
 extern void do_cmd_fire(void);
@@ -763,7 +762,6 @@ extern void do_cmd_magic_eater(bool only_browse);
 
 /* dungeon.c */
 extern void leave_quest_check(void);
-extern void load_all_pref_files(void);
 extern void extract_option_vars(void);
 extern void determine_bounty_uniques(void);
 extern void determine_today_mon(bool conv_old);
@@ -1418,6 +1416,7 @@ extern bool raise_possible(monster_type *m_ptr);
 extern bool spell_is_inate(u16b spell);
 
 /* mspells2.c */
+extern void get_project_point(int sy, int sx, int *ty, int *tx, int flg);
 extern bool monst_spell_monst(int m_idx);
 
 /* artifact.c */
@@ -1549,7 +1548,7 @@ extern bool do_cmd_disarm_aux(int y, int x, int dir);
 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 void py_pickup_floor(int pickup);
+extern void py_pickup_floor(bool pickup);
 
 /* variable.c */
 extern bool easy_floor;