Merge branch 'upstream'

1 files changed, 22 insertions, 21 deletions

diff --git a/src/init1.hpp b/src/init1.hpp
index 766e467d..1c417285 100644
--- a/src/init1.hpp
+++ b/src/init1.hpp
@@ -1,26 +1,27 @@
 #pragma once
 
 #include "h-basic.h"
+#include "dungeon_flag_set.hpp"
 
-extern int color_char_to_attr(char c);
+int color_char_to_attr(char c);
 extern byte conv_color[16];
-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_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 process_dungeon_file(cptr name, int *yval, int *xval, int ymax, int xmax, bool_ init, bool_ full);
+errr init_player_info_txt(FILE *fp);
+errr init_ab_info_txt(FILE *fp);
+errr init_s_info_txt(FILE *fp);
+errr init_set_info_txt(FILE *fp);
+errr init_v_info_txt(FILE *fp);
+errr init_f_info_txt(FILE *fp);
+errr init_k_info_txt(FILE *fp);
+errr init_a_info_txt(FILE *fp);
+errr init_ra_info_txt(FILE *fp);
+errr init_e_info_txt(FILE *fp);
+errr init_r_info_txt(FILE *fp);
+errr init_re_info_txt(FILE *fp);
+errr init_d_info_txt(FILE *fp);
+errr init_t_info_txt(FILE *fp);
+errr init_ba_info_txt(FILE *fp);
+errr init_st_info_txt(FILE *fp);
+errr init_ow_info_txt(FILE *fp);
+errr init_wf_info_txt(FILE *fp);
+errr grab_one_dungeon_flag(dungeon_flag_set *flags, const char *str);
+errr process_dungeon_file(cptr name, int *yval, int *xval, int ymax, int xmax, bool_ init, bool_ full);