[Refactor] #37353 cmd4～gameoption間整理。 / Refactor between cmd4 and gameoption.

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

diff --git a/src/externs.h b/src/externs.h
index f0adc9d..de6f941 100644 (file)
--- 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;
@@ -166,6 +169,7 @@ extern s16b num_repro;
 extern DEPTH object_level;
 extern DEPTH monster_level;
 extern DEPTH base_level;
+extern bool invoking_midnight_curse;
 extern s32b turn;
 extern s32b turn_limit;
 extern s32b dungeon_turn;
@@ -188,7 +192,6 @@ extern bool shimmer_monsters;
 extern bool shimmer_objects;
 extern bool repair_monsters;
 extern bool repair_objects;
-extern s16b inven_nxt;
 extern s16b inven_cnt;
 extern s16b equip_cnt;
 extern s16b o_max;
@@ -203,7 +206,7 @@ extern int leaving_quest;
 extern bool reinit_wilderness;
 extern bool multi_rew;
 extern char summon_kin_type;
-extern bool hack_mind;
+extern bool is_loading_now;
 extern bool hack_mutation;
 
 
@@ -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;
@@ -425,7 +429,7 @@ extern cptr *macro__pat;
 extern cptr *macro__act;
 extern bool *macro__cmd;
 extern char *macro__buf;
-extern s16b quark__num;
+extern STR_OFFSET quark__num;
 extern cptr *quark__str;
 extern u32b message__next;
 extern u32b message__last;
@@ -521,7 +525,7 @@ extern bool monk_armour_aux;
 extern bool monk_notify_aux;
 extern wilderness_type **wilderness;
 extern building_type building[MAX_BLDG];
-extern QUEST_IDX max_quests;
+extern QUEST_IDX max_q_idx;
 extern MONRACE_IDX max_r_idx;
 extern IDX max_k_idx;
 extern IDX max_v_idx;
@@ -734,31 +738,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);
-
 /* cmd4.c */
 #ifndef JP
 extern cptr get_ordinal_number_suffix(int num);
@@ -796,30 +780,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);
-
-/* cmd6.c */
-extern void do_cmd_eat_food(void);
-extern void do_cmd_quaff_potion(void);
-extern void do_cmd_read_scroll(void);
-extern void do_cmd_aim_wand(void);
-extern void do_cmd_use_staff(void);
-extern void do_cmd_zap_rod(void);
-extern void do_cmd_activate(void);
-extern void do_cmd_rerate_aux(void);
-extern void do_cmd_rerate(bool display);
-extern void ring_of_power(int dir);
-extern void do_cmd_use(void);
-extern bool do_cmd_magic_eater(bool only_browse, bool powerful);
 
-/* 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);
@@ -1090,6 +1055,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);
@@ -1103,7 +1069,6 @@ extern void seal_of_mirror(HIT_POINT dam);
 
 /* spells2.c */
 extern void message_pain(MONSTER_IDX m_idx, HIT_POINT dam);
-extern void self_knowledge(void);
 extern bool detect_traps(POSITION range, bool known);
 extern bool detect_doors(POSITION range);
 extern bool detect_stairs(POSITION range);
@@ -1146,6 +1111,7 @@ extern void unlite_room(int y1, int x1);
 extern bool lite_area(HIT_POINT dam, int rad);
 extern bool unlite_area(HIT_POINT dam, int rad);
 extern bool fire_ball(int typ, int dir, HIT_POINT dam, int rad);
+extern bool fire_breath(int typ, int dir, HIT_POINT dam, int rad);
 extern bool fire_rocket(int typ, int dir, HIT_POINT dam, int rad);
 extern bool fire_ball_hide(int typ, int dir, HIT_POINT dam, int rad);
 extern bool fire_meteor(MONSTER_IDX who, EFFECT_ID typ, POSITION x, POSITION y, HIT_POINT dam, POSITION rad);
@@ -1155,7 +1121,7 @@ extern void call_chaos(void);
 extern bool fire_beam(int typ, int dir, HIT_POINT dam);
 extern bool fire_bolt_or_beam(int prob, int typ, int dir, HIT_POINT dam);
 extern bool lite_line(int dir, HIT_POINT dam);
-extern bool drain_life(int dir, HIT_POINT dam);
+extern bool hypodynamic_bolt(int dir, HIT_POINT dam);
 extern bool death_ray(int dir, int plev);
 extern bool wall_to_mud(int dir, HIT_POINT dam);
 extern bool destroy_door(int dir);
@@ -1198,10 +1164,8 @@ extern bool charm_monster(int dir, int plev);
 extern bool control_one_undead(int dir, int plev);
 extern bool control_one_demon(int dir, int plev);
 extern bool charm_animal(int dir, int plev);
-extern bool charm_living(int dir, int plev);
 extern bool mindblast_monsters(HIT_POINT dam);
 extern s32b flag_cost(object_type *o_ptr, int plusses);
-extern void report_magics(void);
 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);
@@ -1211,6 +1175,13 @@ extern void discharge_minion(void);
 extern bool kawarimi(bool success);
 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);
 
 /* spells3.c */
 extern bool teleport_away(MONSTER_IDX m_idx, int dis, BIT_FLAGS mode);
@@ -1337,7 +1308,7 @@ extern sint macro_find_exact(cptr pat);
 extern char inkey(void);
 extern cptr quark_str(STR_OFFSET num);
 extern void quark_init(void);
-extern s16b quark_add(cptr str);
+extern u16b quark_add(cptr str);
 extern s32b message_num(void);
 extern cptr message_str(int age);
 extern void message_add(cptr msg);
@@ -1532,9 +1503,7 @@ extern void one_ability(object_type *o_ptr);
 extern void one_activation(object_type *o_ptr);
 extern bool create_artifact(object_type *o_ptr, bool a_scroll);
 extern int activation_index(object_type *o_ptr);
-extern bool activate_random_artifact(object_type * o_ptr);
 extern const activation_type* find_activation_info(object_type *o_ptr);
-extern void get_bloody_moon_flags(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);
 
@@ -1597,6 +1566,7 @@ extern MULTIPLY mult_hissatsu(MULTIPLY mult, BIT_FLAGS *flgs, monster_type *m_pt
 extern int count_bits(BIT_FLAGS x);
 extern bool gain_random_mutation(int choose_mut);
 extern bool lose_mutation(int choose_mut);
+extern void lose_all_mutations(void);
 extern void dump_mutations(FILE *OutFile);
 extern void do_cmd_knowledge_mutations(void);
 extern int calc_mutant_regenerate_mod(void);
@@ -1729,6 +1699,8 @@ extern void spoil_random_artifact(cptr fname);
 
 /* wizard2.c */
 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);
 
 /* avatar.c */
 extern bool compare_virtue(int type, int num, int tekitou);
@@ -1758,6 +1730,7 @@ extern cptr make_screen_dump(void);
 
 /* inet.c */
 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 disconnect_server(int sd);
@@ -1808,3 +1781,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);