summaryrefslogtreecommitdiff
path: root/src/init1.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/init1.c')
-rw-r--r--src/init1.c74
1 files changed, 37 insertions, 37 deletions
diff --git a/src/init1.c b/src/init1.c
index ded9a281..d8fc7053 100644
--- a/src/init1.c
+++ b/src/init1.c
@@ -1531,7 +1531,7 @@ static void fp_stack_push(cptr name)
}
}
-static bool fp_stack_pop()
+static bool_ fp_stack_pop()
{
if (fp_stack_idx > 0)
{
@@ -1570,7 +1570,7 @@ static int my_fgets_dostack(char *buf, int len)
/*
* Grab one race flag from a textual string
*/
-static bool unknown_shut_up = FALSE;
+static bool_ unknown_shut_up = FALSE;
static errr grab_one_class_flag(u32b *choice, cptr what)
{
int i;
@@ -1782,7 +1782,7 @@ errr init_player_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
player_race *rp_ptr = NULL;
@@ -3412,13 +3412,13 @@ 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, bool start)
+errr init_v_info_txt(FILE *fp, char *buf, bool_ start)
{
int i;
char *s;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
vault_type *v_ptr = NULL;
@@ -3660,7 +3660,7 @@ errr init_f_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
u32b default_desc = 0, default_tunnel = 0, default_block = 0;
/* Current entry */
@@ -3995,7 +3995,7 @@ errr init_f_info_txt(FILE *fp, char *buf)
/*
* Grab one flag in an object_kind from a textual string
*/
-static errr grab_one_kind_flag(object_kind *k_ptr, cptr what, bool obvious)
+static errr grab_one_kind_flag(object_kind *k_ptr, cptr what, bool_ obvious)
{
int i;
@@ -4107,7 +4107,7 @@ errr init_k_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
object_kind *k_ptr = NULL;
@@ -4605,7 +4605,7 @@ errr init_al_info_txt(FILE *fp, char *buf)
struct artifact_select_flag *a_ptr = NULL;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Just before the first record */
error_idx = -1;
@@ -4906,7 +4906,7 @@ errr init_al_info_txt(FILE *fp, char *buf)
/*
* Grab one flag in an artifact_type from a textual string
*/
-static errr grab_one_artifact_flag(artifact_type *a_ptr, cptr what, bool obvious)
+static errr grab_one_artifact_flag(artifact_type *a_ptr, cptr what, bool_ obvious)
{
int i;
@@ -5021,7 +5021,7 @@ errr init_a_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
artifact_type *a_ptr = NULL;
@@ -5361,7 +5361,7 @@ errr init_set_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
set_type *set_ptr = NULL;
@@ -5598,7 +5598,7 @@ errr init_s_info_txt(FILE *fp, char *buf)
char *s;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
skill_type *s_ptr = NULL;
@@ -5977,7 +5977,7 @@ errr init_ab_info_txt(FILE *fp, char *buf)
char *s;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
ability_type *ab_ptr = NULL;
@@ -6312,7 +6312,7 @@ errr init_ab_info_txt(FILE *fp, char *buf)
/*
* Grab one flag in a ego-item_type from a textual string
*/
-static bool grab_one_ego_item_flag(ego_item_type *e_ptr, cptr what, int n, bool obvious)
+static bool_ grab_one_ego_item_flag(ego_item_type *e_ptr, cptr what, int n, bool_ obvious)
{
int i;
@@ -6424,7 +6424,7 @@ static bool grab_one_ego_item_flag(ego_item_type *e_ptr, cptr what, int n, bool
return (1);
}
-static bool grab_one_ego_item_flag_restrict(ego_item_type *e_ptr, cptr what, bool need)
+static bool_ grab_one_ego_item_flag_restrict(ego_item_type *e_ptr, cptr what, bool_ need)
{
int i;
@@ -6539,7 +6539,7 @@ errr init_e_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
ego_item_type *e_ptr = NULL;
@@ -6934,7 +6934,7 @@ errr init_e_info_txt(FILE *fp, char *buf)
/*
* Grab one flag in a randart_part_type from a textual string
*/
-static bool grab_one_randart_item_flag(randart_part_type *ra_ptr, cptr what, char c)
+static bool_ grab_one_randart_item_flag(randart_part_type *ra_ptr, cptr what, char c)
{
int i;
u32b *f1, *f2, *f3, *f4, *f5, *esp;
@@ -7061,7 +7061,7 @@ errr init_ra_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
randart_part_type *ra_ptr = NULL;
@@ -7468,7 +7468,7 @@ errr init_r_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
monster_race *r_ptr = NULL;
@@ -7875,7 +7875,7 @@ errr init_r_info_txt(FILE *fp, char *buf)
/*
* Grab one (basic) flag in a monster_race from a textual string
*/
-static errr grab_one_basic_ego_flag(monster_ego *re_ptr, cptr what, bool add)
+static errr grab_one_basic_ego_flag(monster_ego *re_ptr, cptr what, bool_ add)
{
int i;
@@ -7968,7 +7968,7 @@ static errr grab_one_basic_ego_flag(monster_ego *re_ptr, cptr what, bool add)
/*
* Grab one (spell) flag in a monster_race from a textual string
*/
-static errr grab_one_spell_ego_flag(monster_ego *re_ptr, cptr what, bool add)
+static errr grab_one_spell_ego_flag(monster_ego *re_ptr, cptr what, bool_ add)
{
int i;
@@ -8021,7 +8021,7 @@ static errr grab_one_spell_ego_flag(monster_ego *re_ptr, cptr what, bool add)
/*
* Grab one (basic) flag in a monster_race from a textual string
*/
-static errr grab_one_ego_flag(monster_ego *re_ptr, cptr what, bool must)
+static errr grab_one_ego_flag(monster_ego *re_ptr, cptr what, bool_ must)
{
int i;
@@ -8111,7 +8111,7 @@ errr init_re_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
monster_ego *re_ptr = NULL;
@@ -8652,7 +8652,7 @@ errr init_t_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
trap_type *t_ptr = NULL;
@@ -9025,7 +9025,7 @@ errr init_d_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
dungeon_info_type *d_ptr = NULL;
@@ -9670,7 +9670,7 @@ errr init_st_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
store_info_type *st_ptr = NULL;
@@ -9959,7 +9959,7 @@ errr init_ba_info_txt(FILE *fp, char *buf)
char *s;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
store_action_type *ba_ptr = NULL;
@@ -10129,7 +10129,7 @@ errr init_ow_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
owner_type *ow_ptr = NULL;
@@ -10376,7 +10376,7 @@ errr init_wf_info_txt(FILE *fp, char *buf)
char *s, *t;
/* Not ready yet */
- bool okay = FALSE;
+ bool_ okay = FALSE;
/* Current entry */
wilderness_type_info *wf_ptr = NULL;
@@ -10622,17 +10622,17 @@ struct dungeon_grid
int bx, by; /* For between gates */
int mimic; /* Mimiced features */
s32b mflag; /* monster's mflag */
- bool ok;
- bool defined;
+ bool_ ok;
+ bool_ defined;
};
-static bool meta_sleep = TRUE;
+static bool_ meta_sleep = TRUE;
static dungeon_grid letter[255];
/*
* Parse a sub-file of the "extra info"
*/
-bool process_dungeon_file_full = FALSE;
+bool_ process_dungeon_file_full = FALSE;
static errr process_dungeon_file_aux(char *buf, int *yval, int *xval, int xvalstart, int ymax, int xmax)
{
int i;
@@ -11549,7 +11549,7 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
/* Other */
else
{
- bool text_mode = FALSE;
+ bool_ text_mode = FALSE;
/* Accept all printables except spaces and brackets */
while (isprint(*s))
@@ -11710,7 +11710,7 @@ static cptr process_dungeon_file_expr(char **sp, char *fp)
}
-errr process_dungeon_file(cptr full_text, cptr name, int *yval, int *xval, int ymax, int xmax, bool init)
+errr process_dungeon_file(cptr full_text, cptr name, int *yval, int *xval, int ymax, int xmax, bool_ init)
{
FILE *fp = 0;
@@ -11720,7 +11720,7 @@ errr process_dungeon_file(cptr full_text, cptr name, int *yval, int *xval, int y
errr err = 0;
- bool bypass = FALSE;
+ bool_ bypass = FALSE;
/* Save the start since it ought to be modified */
int xmin = *xval;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 21:34:32 +0000