From 899041ce6b7cbc33e8cb3124aaa54b518c4a4b72 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 29 Mar 2016 20:32:55 +0200 Subject: Convert dungeon_info_type to use new flag_set --- src/init1.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/init1.hpp') diff --git a/src/init1.hpp b/src/init1.hpp index 766e467d..3f0198a7 100644 --- a/src/init1.hpp +++ b/src/init1.hpp @@ -1,6 +1,7 @@ #pragma once #include "h-basic.h" +#include "dungeon_flag_set.hpp" extern int color_char_to_attr(char c); extern byte conv_color[16]; @@ -22,5 +23,5 @@ 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 grab_one_dungeon_flag(dungeon_flag_set *flags, const char *str); extern errr process_dungeon_file(cptr name, int *yval, int *xval, int ymax, int xmax, bool_ init, bool_ full); -- cgit v1.2.3 From a40e1d524849e22edf2fb65b5c2fedbe47a59b81 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Tue, 2 May 2017 19:20:57 +0200 Subject: Remove redundant "extern" on function declarations --- src/init1.hpp | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'src/init1.hpp') diff --git a/src/init1.hpp b/src/init1.hpp index 3f0198a7..1c417285 100644 --- a/src/init1.hpp +++ b/src/init1.hpp @@ -3,25 +3,25 @@ #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(dungeon_flag_set *flags, const char *str); -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); -- cgit v1.2.3