Replace uses of bool_ in xtra1.*

4 files changed, 18 insertions, 15 deletions

diff --git a/src/bldg.cc b/src/bldg.cc
index 34c95829..b93926f4 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -949,7 +949,7 @@ static bool compare_weapons()
 
 	i_ptr = &p_ptr->inventory[INVEN_WIELD];
 	object_copy(i_ptr, o1_ptr);
-	calc_bonuses(TRUE);
+	calc_bonuses(true);
 
 	list_weapon(o1_ptr, i, 2);
 	compare_weapon_aux1(o1_ptr, 2, i + 8);
@@ -959,14 +959,14 @@ static bool compare_weapons()
 		object_copy(i_ptr, orig_ptr);
 	else
 		object_copy(i_ptr, o2_ptr);
-	calc_bonuses(TRUE);
+	calc_bonuses(true);
 
 	list_weapon(o2_ptr, i, 40);
 	compare_weapon_aux1(o2_ptr, 40, i + 8);
 
 	i_ptr = &p_ptr->inventory[INVEN_WIELD];
 	object_copy(i_ptr, orig_ptr);
-	calc_bonuses(TRUE);
+	calc_bonuses(true);
 
 	object_wipe(orig_ptr);
 
diff --git a/src/object1.cc b/src/object1.cc
index ee54fd74..2b4048f1 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -1873,7 +1873,7 @@ void display_weapon_damage(object_type *o_ptr)
 	/* Ok now the hackish stuff, we replace the current weapon with this one */
 	object_copy(old_ptr, &p_ptr->inventory[INVEN_WIELD]);
 	object_copy(&p_ptr->inventory[INVEN_WIELD], o_ptr);
-	calc_bonuses(TRUE);
+	calc_bonuses(true);
 
 	text_out("\nUsing it you would have ");
 	text_out_c(TERM_L_GREEN, format("%d ", p_ptr->num_blow));
@@ -1906,7 +1906,7 @@ void display_weapon_damage(object_type *o_ptr)
 
 	/* get our weapon back */
 	object_copy(&p_ptr->inventory[INVEN_WIELD], old_ptr);
-	calc_bonuses(TRUE);
+	calc_bonuses(true);
 }
 
 /*
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 1bd50b37..3e139ba1 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -1377,7 +1377,7 @@ static void calc_powers_corruption()
 
 
 /* Ugly hack */
-bool_ calc_powers_silent = FALSE;
+bool calc_powers_silent = false;
 
 /* Add in powers */
 static void add_powers(std::vector<s16b> const &powers)
@@ -1489,7 +1489,7 @@ static void calc_powers()
 		}
 	}
 
-	calc_powers_silent = FALSE;
+	calc_powers_silent = false;
 }
 
 
@@ -2680,7 +2680,7 @@ static bool_ monk_empty_hands()
  * This function induces various "status" messages, unless silent is
  * TRUE.
  */
-void calc_bonuses(bool_ silent)
+void calc_bonuses(bool silent)
 {
 	auto const &s_descriptors = game->edit_data.s_descriptors;
 	auto const &r_info = game->edit_data.r_info;
@@ -3983,7 +3983,7 @@ void update_stuff()
 		calc_powers();
 
 		p_ptr->update &= ~(PU_BONUS);
-		calc_bonuses(FALSE);
+		calc_bonuses(false);
 	}
 
 	if (p_ptr->update & (PU_TORCH))
@@ -4210,11 +4210,14 @@ void handle_stuff()
 }
 
 
-bool_ monk_heavy_armor()
+bool monk_heavy_armor()
 {
 	u16b monk_arm_wgt = 0;
 
-	if (p_ptr->melee_style != SKILL_HAND) return FALSE;
+	if (p_ptr->melee_style != SKILL_HAND)
+	{
+		return false;
+	}
 
 	/* Weight the armor */
 	monk_arm_wgt += p_ptr->inventory[INVEN_BODY].weight;
@@ -4224,7 +4227,7 @@ bool_ monk_heavy_armor()
 	monk_arm_wgt += p_ptr->inventory[INVEN_HANDS].weight;
 	monk_arm_wgt += p_ptr->inventory[INVEN_FEET].weight;
 
-	return (monk_arm_wgt > (100 + (get_skill(SKILL_HAND) * 4))) ;
+	return monk_arm_wgt > (100 + (get_skill(SKILL_HAND) * 4));
 }
 
 static int get_artifact_idx(int level)
diff --git a/src/xtra1.hpp b/src/xtra1.hpp
index 5eef7f8e..32eeea05 100644
--- a/src/xtra1.hpp
+++ b/src/xtra1.hpp
@@ -10,7 +10,7 @@ void fix_message();
 void apply_flags(object_flag_set const &f, s16b pval, s16b tval, s16b to_h, s16b to_d, s16b to_a);
 int luck(int min, int max);
 int weight_limit();
-extern bool_ calc_powers_silent;
+extern bool calc_powers_silent;
 void cnv_stat(int i, char *out_val);
 s16b modify_stat_value(int value, int amount);
 void calc_hitpoints();
@@ -19,8 +19,8 @@ void update_stuff();
 void redraw_stuff();
 void window_stuff();
 void handle_stuff();
-bool_ monk_heavy_armor();
-void calc_bonuses(bool_ silent);
+bool monk_heavy_armor();
+void calc_bonuses(bool silent);
 void gain_fate(byte fate);
 std::string fate_desc(int fate);
 std::string dump_fates();