[Refactor] #37353 型の置換。 / Type replacement.

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

diff --git a/src/externs.h b/src/externs.h
index 7951e16..9d41563 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -333,7 +333,6 @@ 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 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);
@@ -535,7 +534,7 @@ 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(FEAT_IDX feat);
 extern void move_player(DIRECTION dir, bool do_pickup, bool break_trap);
@@ -674,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);
@@ -726,7 +725,7 @@ 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 monsterrace_hook_type get_monster_hook(void);
@@ -768,7 +767,7 @@ 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);
@@ -837,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);
@@ -1020,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);
@@ -1065,13 +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);
 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);
@@ -1128,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);
@@ -1158,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);
 
@@ -1169,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);
@@ -1180,6 +1175,8 @@ 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 handle_stuff(void);
+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);
@@ -1287,13 +1284,8 @@ 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 */
@@ -1484,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);
@@ -1496,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);
@@ -1515,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);