Search/replace bool_ with bool

We also search/replace TRUE/FALSE with their bool equivalents.

1 files changed, 18 insertions, 18 deletions

diff --git a/src/q_fireprof.cc b/src/q_fireprof.cc
index 7093b058..430e172e 100644
--- a/src/q_fireprof.cc
+++ b/src/q_fireprof.cc
@@ -90,7 +90,7 @@ static object_filter_t const &item_tester_hook_proofable()
 /*
  * This function makes sure the player has enough 'points' left to fireproof stuff.
  */
-static bool_ fireproof_enough_points(object_type *o_ptr, int *stack)
+static bool fireproof_enough_points(object_type *o_ptr, int *stack)
 {
 	int item_value;
 
@@ -119,14 +119,14 @@ static bool_ fireproof_enough_points(object_type *o_ptr, int *stack)
 		item_value = FIREPROOF_SCROLL_POINTS * (*stack);
 		break;
 	default:
-		assert(FALSE);
+		assert(false);
 	}
 
 	/* do we have enough points? */
 	if (item_value > get_item_points_remaining())
 	{
 		msg_print("I do not have enough fireproofing material for that.");
-		return FALSE;
+		return false;
 	}
 	else
 	{
@@ -140,10 +140,10 @@ static bool_ fireproof_enough_points(object_type *o_ptr, int *stack)
 		cquest.status = QUEST_STATUS_REWARDED;
 	}
 
-	return TRUE;
+	return true;
 }
 
-static bool_ fireproof()
+static bool fireproof()
 {
 	int item;
 	if (!get_item(&item,
@@ -152,7 +152,7 @@ static bool_ fireproof()
 		      USE_INVEN,
 		      item_tester_hook_proofable()))
 	{
-		return FALSE;
+		return false;
 	}
 
 	/* get the object type from the number */
@@ -162,12 +162,12 @@ static bool_ fireproof()
 	int stack = 0;
 	if (!fireproof_enough_points(obj2, &stack))
 	{
-		return FALSE;
+		return false;
 	}
 
 	/* Do the actual fireproofing */
 	{
-		bool_ carry_it;
+		bool carry_it;
 		object_type *obj3;
 		object_type obj_forge;
 		s32b oldpval, oldpval2, oldpval3;
@@ -186,7 +186,7 @@ static bool_ fireproof()
 			obj3 = &obj_forge;
 
 			/* we'll need to add this to the inventory after fireproofing */
-			carry_it = TRUE;
+			carry_it = true;
 		}
 		else
 		{
@@ -194,7 +194,7 @@ static bool_ fireproof()
 			obj3 = obj2;
 
 			/* we'll be dealing this while it's still in the inventory */
-			carry_it = FALSE;
+			carry_it = false;
 		}
 
 		/* make it fireproof */
@@ -205,22 +205,22 @@ static bool_ fireproof()
 		oldpval = obj3->pval;
 		oldpval2 = obj3->pval2;
 		oldpval3 = obj3->pval3;
-		apply_magic(obj3, -1, FALSE, FALSE, FALSE);
+		apply_magic(obj3, -1, false, false, false);
 		obj3->pval = oldpval;
 		obj3->pval2 = oldpval2;
 		obj3->pval3 = oldpval3;
 
 		/* put it in the inventory if it's only part of a stack */
-		if (carry_it == TRUE)
+		if (carry_it == true)
 		{
-			inven_carry(obj3, TRUE);
+			inven_carry(obj3, true);
 		}
 
 		/* id and notice it */
 		object_aware(obj3);
 		object_known(obj3);
 
-		return TRUE;
+		return true;
 	}
 }
 
@@ -291,7 +291,7 @@ void quest_fireproof_building(bool *paid, bool *recreate)
 				ret = fireproof();
 
 				/* don't loop the fireproof if there's nothing to fireproof */
-				if (ret == FALSE)
+				if (ret == false)
 				{
 					break;
 				}
@@ -334,7 +334,7 @@ void quest_fireproof_building(bool *paid, bool *recreate)
 			int ret = fireproof();
 
 			/* don't loop the fireproof if there's nothing to fireproof */
-			if (ret == FALSE)
+			if (ret == false)
 			{
 				break;
 			}
@@ -392,7 +392,7 @@ static bool fireproof_stair_hook(void *, void *, void *)
 	}
 	else
 	{
-		bool_ ret;
+		bool ret;
 
 		if (cave[p_ptr->py][p_ptr->px].feat != FEAT_LESS)
 		{
@@ -406,7 +406,7 @@ static bool fireproof_stair_hook(void *, void *, void *)
 		ret = get_check("Really abandon the quest?");
 
 		/* if yes, then */
-		if  (ret == TRUE)
+		if  (ret == true)
 		{
 			/* fail the quest */
 			cquest.status = QUEST_STATUS_FAILED;