Remove redefinition of "bool" for C++ friendliness.

1 files changed, 21 insertions, 21 deletions

diff --git a/src/monster1.c b/src/monster1.c
index cb8be90b..de18e3c8 100644
--- a/src/monster1.c
+++ b/src/monster1.c
@@ -35,7 +35,7 @@ static cptr wd_his[3] = { "its", "his", "her" };
  * Determine if the "armor" is known
  * The higher the level, the fewer kills needed.
  */
-static bool know_armour(int r_idx)
+static bool_ know_armour(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -62,7 +62,7 @@ static bool know_armour(int r_idx)
  * the higher the level of the monster, the fewer the attacks you need,
  * the more damage an attack does, the more attacks you need
  */
-static bool know_damage(int r_idx, int i)
+static bool_ know_damage(int r_idx, int i)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -105,8 +105,8 @@ static void roff_aux(int r_idx, int ego, int remem)
 {
 	monster_race *r_ptr;
 
-	bool old = FALSE;
-	bool sin = FALSE;
+	bool_ old = FALSE;
+	bool_ sin = FALSE;
 
 	int m, n, r;
 
@@ -114,8 +114,8 @@ static void roff_aux(int r_idx, int ego, int remem)
 
 	int msex = 0;
 
-	bool breath = FALSE;
-	bool magic = FALSE;
+	bool_ breath = FALSE;
+	bool_ magic = FALSE;
 
 	u32b	flags1;
 	u32b	flags2;
@@ -254,7 +254,7 @@ static void roff_aux(int r_idx, int ego, int remem)
 	else if (flags1 & (RF1_UNIQUE))
 	{
 		/* Hack -- Determine if the unique is "dead" */
-		bool dead = (r_ptr->max_num == 0) ? TRUE : FALSE;
+		bool_ dead = (r_ptr->max_num == 0) ? TRUE : FALSE;
 
 		/* We've been killed... */
 		if (r_ptr->r_deaths)
@@ -1644,7 +1644,7 @@ void display_roff(int r_idx, int ego)
 }
 
 
-bool monster_quest(int r_idx)
+bool_ monster_quest(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1661,7 +1661,7 @@ bool monster_quest(int r_idx)
 }
 
 
-bool monster_dungeon(int r_idx)
+bool_ monster_dungeon(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1672,7 +1672,7 @@ bool monster_dungeon(int r_idx)
 }
 
 
-bool monster_ocean(int r_idx)
+bool_ monster_ocean(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1683,7 +1683,7 @@ bool monster_ocean(int r_idx)
 }
 
 
-bool monster_shore(int r_idx)
+bool_ monster_shore(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1694,7 +1694,7 @@ bool monster_shore(int r_idx)
 }
 
 
-bool monster_waste(int r_idx)
+bool_ monster_waste(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1705,7 +1705,7 @@ bool monster_waste(int r_idx)
 }
 
 
-bool monster_town(int r_idx)
+bool_ monster_town(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1716,7 +1716,7 @@ bool monster_town(int r_idx)
 }
 
 
-bool monster_wood(int r_idx)
+bool_ monster_wood(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1727,7 +1727,7 @@ bool monster_wood(int r_idx)
 }
 
 
-bool monster_volcano(int r_idx)
+bool_ monster_volcano(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1738,7 +1738,7 @@ bool monster_volcano(int r_idx)
 }
 
 
-bool monster_mountain(int r_idx)
+bool_ monster_mountain(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1749,7 +1749,7 @@ bool monster_mountain(int r_idx)
 }
 
 
-bool monster_grass(int r_idx)
+bool_ monster_grass(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1760,7 +1760,7 @@ bool monster_grass(int r_idx)
 }
 
 
-bool monster_deep_water(int r_idx)
+bool_ monster_deep_water(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1773,7 +1773,7 @@ bool monster_deep_water(int r_idx)
 }
 
 
-bool monster_shallow_water(int r_idx)
+bool_ monster_shallow_water(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1786,7 +1786,7 @@ bool monster_shallow_water(int r_idx)
 }
 
 
-bool monster_lava(int r_idx)
+bool_ monster_lava(int r_idx)
 {
 	monster_race *r_ptr = &r_info[r_idx];
 
@@ -1847,7 +1847,7 @@ void set_mon_num_hook(void)
 /*
  * Check if monster can cross terrain
  */
-bool monster_can_cross_terrain(byte feat, monster_race *r_ptr)
+bool_ monster_can_cross_terrain(byte feat, monster_race *r_ptr)
 {
 	/* Deep water */
 	if (feat == FEAT_DEEP_WATER)