diff options
| -rw-r--r-- | src/init1.cc | 72 | ||||
| -rw-r--r-- | src/init1.hpp | 38 | ||||
| -rw-r--r-- | src/init2.cc | 80 |
3 files changed, 96 insertions, 94 deletions
diff --git a/src/init1.cc b/src/init1.cc index 276012dd..30eed949 100644 --- a/src/init1.cc +++ b/src/init1.cc @@ -1764,7 +1764,7 @@ static errr grab_one_race_kind_flag(u32b *f1, u32b *f2, u32b *f3, u32b *f4, u32b /* * Initialize the "player" arrays, by parsing an ascii "template" file */ -errr init_player_info_txt(FILE *fp, char *buf) +errr init_player_info_txt(FILE *fp) { int i = 0, z; int powers = 0; @@ -1772,7 +1772,7 @@ errr init_player_info_txt(FILE *fp, char *buf) int tit_idx = 0; int spec_idx = 0; int cur_ab = -1; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -3308,9 +3308,10 @@ errr init_player_info_txt(FILE *fp, char *buf) /* * Initialize the "v_info" array, by parsing an ascii "template" file */ -errr init_v_info_txt(FILE *fp, char *buf) +errr init_v_info_txt(FILE *fp) { int i; + char buf[1024]; char *s; /* Not ready yet */ @@ -3509,10 +3510,10 @@ static errr grab_one_feature_flag(feature_type *f_ptr, cptr what) /* * Initialize the "f_info" array, by parsing an ascii "template" file */ -errr init_f_info_txt(FILE *fp, char *buf) +errr init_f_info_txt(FILE *fp) { int i; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -3902,10 +3903,10 @@ static errr grab_one_kind_flag(object_kind *k_ptr, cptr what, bool_ obvious) /* * Initialize the "k_info" array, by parsing an ascii "template" file */ -errr init_k_info_txt(FILE *fp, char *buf) +errr init_k_info_txt(FILE *fp) { int i; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -4359,11 +4360,12 @@ int init_al_info_essence(char *essence) /* * Initialize the "al_info" array, by parsing an ascii "template" file */ -errr init_al_info_txt(FILE *fp, char *buf) +errr init_al_info_txt(FILE *fp) { int al_idx = 0, a_idx = 0; char *s, *t; struct artifact_select_flag *a_ptr = NULL; + char buf[1024]; /* Not ready yet */ bool_ okay = FALSE; @@ -4736,10 +4738,10 @@ static errr grab_one_artifact_flag(artifact_type *a_ptr, cptr what, bool_ obviou /* * Initialize the "a_info" array, by parsing an ascii "template" file */ -errr init_a_info_txt(FILE *fp, char *buf) +errr init_a_info_txt(FILE *fp) { int i; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -5036,10 +5038,11 @@ errr init_a_info_txt(FILE *fp, char *buf) /* * Initialize the "set_info" array, by parsing an ascii "template" file */ -errr init_set_info_txt(FILE *fp, char *buf) +errr init_set_info_txt(FILE *fp) { int i; int cur_art = 0, cur_num = 0; + char buf[1024]; char *s, *t; @@ -5242,10 +5245,10 @@ errr init_set_info_txt(FILE *fp, char *buf) /* * Initialize the "s_info" array, by parsing an ascii "template" file */ -errr init_s_info_txt(FILE *fp, char *buf) +errr init_s_info_txt(FILE *fp) { int i, z, order = 1; - + char buf[1024]; char *s; /* Not ready yet */ @@ -5579,10 +5582,10 @@ errr init_s_info_txt(FILE *fp, char *buf) /* * Initialize the "ab_info" array, by parsing an ascii "template" file */ -errr init_ab_info_txt(FILE *fp, char *buf) +errr init_ab_info_txt(FILE *fp) { int i, z; - + char buf[1024]; char *s; /* Not ready yet */ @@ -6100,10 +6103,10 @@ static bool_ grab_one_ego_item_flag_restrict(ego_item_type *e_ptr, cptr what, bo /* * Initialize the "e_info" array, by parsing an ascii "template" file */ -errr init_e_info_txt(FILE *fp, char *buf) +errr init_e_info_txt(FILE *fp) { int i, cur_r = -1, cur_t = 0, j; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -6603,10 +6606,10 @@ static bool_ grab_one_randart_item_flag(randart_part_type *ra_ptr, cptr what, ch /* * Initialize the "ra_info" array, by parsing an ascii "template" file */ -errr init_ra_info_txt(FILE *fp, char *buf) +errr init_ra_info_txt(FILE *fp) { int i, cur_t = 0, j, cur_g = 0; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -7002,10 +7005,10 @@ static errr grab_one_spell_flag(monster_race *r_ptr, cptr what) /* * Initialize the "r_info" array, by parsing an ascii "template" file */ -errr init_r_info_txt(FILE *fp, char *buf) +errr init_r_info_txt(FILE *fp) { int i; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -7612,10 +7615,10 @@ static errr grab_one_ego_flag(monster_ego *re_ptr, cptr what, bool_ must) /* * Initialize the "re_info" array, by parsing an ascii "template" file */ -errr init_re_info_txt(FILE *fp, char *buf) +errr init_re_info_txt(FILE *fp) { int i, j; - + char buf[1024]; byte blow_num = 0; int r_char_number = 0, nr_char_number = 0; @@ -8131,10 +8134,10 @@ static errr grab_one_trap_type_flag(trap_type *t_ptr, cptr what) /* * Initialize the "tr_info" array, by parsing an ascii "template" file */ -errr init_t_info_txt(FILE *fp, char *buf) +errr init_t_info_txt(FILE *fp) { int i; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -8464,9 +8467,10 @@ static errr grab_one_spell_monster_flag(dungeon_info_type *d_ptr, cptr what, byt /* * Initialize the "d_info" array, by parsing an ascii "template" file */ -errr init_d_info_txt(FILE *fp, char *buf) +errr init_d_info_txt(FILE *fp) { int i, j; + char buf[1024]; s16b rule_num = 0; @@ -9082,10 +9086,10 @@ static errr grab_one_store_flag(store_info_type *st_ptr, cptr what) /* * Initialize the "st_info" array, by parsing an ascii "template" file */ -errr init_st_info_txt(FILE *fp, char *buf) +errr init_st_info_txt(FILE *fp) { int i = 0, item_idx = 0; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -9345,10 +9349,10 @@ errr init_st_info_txt(FILE *fp, char *buf) /* * Initialize the "ba_info" array, by parsing an ascii "template" file */ -errr init_ba_info_txt(FILE *fp, char *buf) +errr init_ba_info_txt(FILE *fp) { int i = 0; - + char buf[1024]; char *s; /* Not ready yet */ @@ -9489,10 +9493,10 @@ errr init_ba_info_txt(FILE *fp, char *buf) /* * Initialize the "ow_info" array, by parsing an ascii "template" file */ -errr init_ow_info_txt(FILE *fp, char *buf) +errr init_ow_info_txt(FILE *fp) { int i; - + char buf[1024]; char *s, *t; /* Not ready yet */ @@ -9706,10 +9710,10 @@ static errr grab_one_wf_info_flag(wilderness_type_info *wf_ptr, cptr what) /* * Initialize the "wf_info" array, by parsing an ascii "template" file */ -errr init_wf_info_txt(FILE *fp, char *buf) +errr init_wf_info_txt(FILE *fp) { int i; - + char buf[1024]; char *s, *t; /* Not ready yet */ diff --git a/src/init1.hpp b/src/init1.hpp index e21bf7bc..69bcec9b 100644 --- a/src/init1.hpp +++ b/src/init1.hpp @@ -4,24 +4,24 @@ extern int color_char_to_attr(char c); extern byte conv_color[16]; -extern errr init_player_info_txt(FILE *fp, char *buf); -extern errr init_ab_info_txt(FILE *fp, char *buf); -extern errr init_s_info_txt(FILE *fp, char *buf); -extern errr init_set_info_txt(FILE *fp, char *buf); -extern errr init_v_info_txt(FILE *fp, char *buf); -extern errr init_f_info_txt(FILE *fp, char *buf); -extern errr init_k_info_txt(FILE *fp, char *buf); -extern errr init_a_info_txt(FILE *fp, char *buf); -extern errr init_al_info_txt(FILE *fp, char *buf); -extern errr init_ra_info_txt(FILE *fp, char *buf); -extern errr init_e_info_txt(FILE *fp, char *buf); -extern errr init_r_info_txt(FILE *fp, char *buf); -extern errr init_re_info_txt(FILE *fp, char *buf); +extern errr init_player_info_txt(FILE *fp); +extern errr init_ab_info_txt(FILE *fp); +extern errr init_s_info_txt(FILE *fp); +extern errr init_set_info_txt(FILE *fp); +extern errr init_v_info_txt(FILE *fp); +extern errr init_f_info_txt(FILE *fp); +extern errr init_k_info_txt(FILE *fp); +extern errr init_a_info_txt(FILE *fp); +extern errr init_al_info_txt(FILE *fp); +extern errr init_ra_info_txt(FILE *fp); +extern errr init_e_info_txt(FILE *fp); +extern errr init_r_info_txt(FILE *fp); +extern errr init_re_info_txt(FILE *fp); +extern errr init_d_info_txt(FILE *fp); +extern errr init_t_info_txt(FILE *fp); +extern errr init_ba_info_txt(FILE *fp); +extern errr init_st_info_txt(FILE *fp); +extern errr init_ow_info_txt(FILE *fp); +extern errr init_wf_info_txt(FILE *fp); extern errr grab_one_dungeon_flag(u32b *flags1, u32b *flags2, cptr what); -extern errr init_d_info_txt(FILE *fp, char *buf); -extern errr init_t_info_txt(FILE *fp, char *buf); -extern errr init_ba_info_txt(FILE *fp, char *buf); -extern errr init_st_info_txt(FILE *fp, char *buf); -extern errr init_ow_info_txt(FILE *fp, char *buf); -extern errr init_wf_info_txt(FILE *fp, char *buf); extern errr process_dungeon_file(cptr name, int *yval, int *xval, int ymax, int xmax, bool_ init, bool_ full); diff --git a/src/init2.cc b/src/init2.cc index a4e91a11..edef495f 100644 --- a/src/init2.cc +++ b/src/init2.cc @@ -284,9 +284,9 @@ namespace { f_info = make_array<feature_type>(max_f_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_f_info_txt(fp, buf); + return init_f_info_txt(fp); } }; @@ -300,9 +300,9 @@ namespace { k_info = make_array<object_kind>(max_k_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_k_info_txt(fp, buf); + return init_k_info_txt(fp); }; }; @@ -316,9 +316,9 @@ namespace { set_info = make_array<set_type>(max_set_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_set_info_txt(fp, buf); + return init_set_info_txt(fp); } }; @@ -332,9 +332,9 @@ namespace { a_info = make_array<artifact_type>(max_a_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_a_info_txt(fp, buf); + return init_a_info_txt(fp); } }; @@ -348,9 +348,9 @@ namespace { s_info = make_array<skill_type>(max_s_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_s_info_txt(fp, buf); + return init_s_info_txt(fp); } }; @@ -364,9 +364,9 @@ namespace { ab_info = make_array<ability_type>(max_ab_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_ab_info_txt(fp, buf); + return init_ab_info_txt(fp); } }; @@ -380,9 +380,9 @@ namespace { e_info = make_array<ego_item_type>(max_e_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_e_info_txt(fp, buf); + return init_e_info_txt(fp); } }; @@ -396,9 +396,9 @@ namespace { ra_info = make_array<randart_part_type>(max_ra_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_ra_info_txt(fp, buf); + return init_ra_info_txt(fp); } }; @@ -412,9 +412,9 @@ namespace { r_info = make_array<monster_race>(max_r_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_r_info_txt(fp, buf); + return init_r_info_txt(fp); } }; @@ -428,9 +428,9 @@ namespace { re_info = make_array<monster_ego>(max_re_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_re_info_txt(fp, buf); + return init_re_info_txt(fp); } }; @@ -444,9 +444,9 @@ namespace { d_info = make_array<dungeon_info_type>(max_d_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_d_info_txt(fp, buf); + return init_d_info_txt(fp); } }; @@ -460,9 +460,9 @@ namespace { st_info = make_array<store_info_type>(max_st_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_st_info_txt(fp, buf); + return init_st_info_txt(fp); } }; @@ -476,9 +476,9 @@ namespace { ow_info = make_array<owner_type>(max_ow_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_ow_info_txt(fp, buf); + return init_ow_info_txt(fp); } }; @@ -492,9 +492,9 @@ namespace { ba_info = make_array<store_action_type>(max_ba_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_ba_info_txt(fp, buf); + return init_ba_info_txt(fp); } }; @@ -508,9 +508,9 @@ namespace { wf_info = make_array<wilderness_type_info>(max_wf_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_wf_info_txt(fp, buf); + return init_wf_info_txt(fp); } }; @@ -524,9 +524,9 @@ namespace { t_info = make_array<trap_type>(max_t_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_t_info_txt(fp, buf); + return init_t_info_txt(fp); } }; @@ -540,9 +540,9 @@ namespace { v_info = make_array<vault_type>(max_v_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_v_info_txt(fp, buf); + return init_v_info_txt(fp); } }; @@ -564,9 +564,9 @@ namespace { } } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_player_info_txt(fp, buf); + return init_player_info_txt(fp); } }; @@ -581,9 +581,9 @@ namespace { a_select_flags = make_array<artifact_select_flag>(max_al_idx); } - static errr parse(FILE *fp, char *buf) + static errr parse(FILE *fp) { - return init_al_info_txt(fp, buf); + return init_al_info_txt(fp); } }; @@ -609,8 +609,7 @@ template<typename T> static errr init_x_info() { } /* Parse the file */ - char buf[1024]; - errr err = T::parse(fp, buf); + errr err = T::parse(fp); /* Close it */ my_fclose(fp); @@ -624,7 +623,6 @@ template<typename T> static errr init_x_info() { /* Oops */ msg_format("Error %d at line %d of '%s'.", err, error_line, T::name); msg_format("Record %d contains a '%s' error.", error_idx, oops); - msg_format("Parsing '%s'.", buf); msg_print(NULL); /* Quit */ |