Remove 'alert_hitpoint' option; behave as if always set

This actually preserves previous behavior since setting the warning
threshold to 0% (default) has the same effect as disabling the alert
entirely.

10 files changed, 12 insertions, 21 deletions

diff --git a/lib/help/macrofaq.txt b/lib/help/macrofaq.txt
index 8194d7fe..a82074c1 100644
--- a/lib/help/macrofaq.txt
+++ b/lib/help/macrofaq.txt
@@ -1772,7 +1772,6 @@ options screen.
 rogue_like_commands
 use_old_target
 always_pickup
-alert_hitpoint
 auto_scum
 
 #####G----------------------------------------------------------------------
diff --git a/lib/help/option.txt b/lib/help/option.txt
index 7563f83b..636fe2d1 100644
--- a/lib/help/option.txt
+++ b/lib/help/option.txt
@@ -171,10 +171,6 @@ off at will during the course of the game.
     even if this option is unset.  (You may also inscribe an item with {.}
     to suppress its random-teleportation power, unless it is cursed.)
 
-#####GAlert user to critical hitpoints    [alert_hitpoint]
-    Produce a "bell" noise, and flushes all pending input, when your hitpoints
-    reach the warning point chosen elsewhere, preventing stupid deaths.
-
 #####GAlert user to various failures    [alert_failure]
     Produce a "bell" noise, and flushes all pending input, when various
     failures occur, as described above.
diff --git a/lib/mods/theme/help/macrofaq.txt b/lib/mods/theme/help/macrofaq.txt
index 035f674b..d285194c 100644
--- a/lib/mods/theme/help/macrofaq.txt
+++ b/lib/mods/theme/help/macrofaq.txt
@@ -1776,7 +1776,6 @@ options screen.
 rogue_like_commands
 use_old_target
 always_pickup
-alert_hitpoint
 auto_scum
 
 #####G----------------------------------------------------------------------
diff --git a/lib/mods/theme/help/option.txt b/lib/mods/theme/help/option.txt
index 00ee15a4..96d84b86 100644
--- a/lib/mods/theme/help/option.txt
+++ b/lib/mods/theme/help/option.txt
@@ -171,10 +171,6 @@ off at will during the course of the game.
     even if this option is unset.  (You may also inscribe an item with {.}
     to suppress its random-teleportation power, unless it is cursed.)
 
-#####GAlert user to critical hitpoints    [alert_hitpoint]
-    Produce a "bell" noise, and flushes all pending input, when your hitpoints
-    reach the warning point chosen elsewhere, preventing stupid deaths.
-
 #####GAlert user to various failures    [alert_failure]
     Produce a "bell" noise, and flushes all pending input, when various
     failures occur, as described above.
diff --git a/lib/mods/theme/user/all.prf b/lib/mods/theme/user/all.prf
index 67671aa4..98b22fc5 100644
--- a/lib/mods/theme/user/all.prf
+++ b/lib/mods/theme/user/all.prf
@@ -62,9 +62,6 @@ X:disturb_minor
 # Option 'Disturb whenever random things happen'
 X:disturb_other
 
-# Option 'Alert user to critical hitpoints'
-Y:alert_hitpoint
-
 # Option 'Alert user to various failures'
 Y:alert_failure
 
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 2e71278e..417e8010 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -1909,7 +1909,10 @@ static void process_world(void)
 		if (p_ptr->chp < warning)
 		{
 			/* Hack -- bell on first notice */
-			if (alert_hitpoint && (old_chp > warning)) bell();
+			if (old_chp > warning)
+			{
+				bell();
+			}
 
 			sound(SOUND_WARN);
 
diff --git a/src/options.cc b/src/options.cc
index 5501ab52..c59644e3 100644
--- a/src/options.cc
+++ b/src/options.cc
@@ -25,7 +25,6 @@ bool_ disturb_detect; 		/* Disturb whenever leaving trap-detected area */
 bool_ disturb_state; 			/* Disturn whenever player state changes */
 bool_ disturb_minor; 			/* Disturb whenever boring things happen */
 bool_ disturb_other; 			/* Disturb whenever various things happen */
-bool_ alert_hitpoint; 		/* Alert user to critical hitpoints */
 bool_ alert_failure; 		/* Alert user to various failures */
 bool_ last_words; 		/* Get last words upon dying */
 bool_ small_levels; 		/* Allow unusually small dungeon levels */
diff --git a/src/options.hpp b/src/options.hpp
index 45e19cf7..0a15570f 100644
--- a/src/options.hpp
+++ b/src/options.hpp
@@ -27,7 +27,6 @@ extern bool_ disturb_detect;
 extern bool_ disturb_state;
 extern bool_ disturb_minor;
 extern bool_ disturb_other;
-extern bool_ alert_hitpoint;
 extern bool_ alert_failure;
 extern bool_ last_words;
 extern bool_ small_levels;
diff --git a/src/spells1.cc b/src/spells1.cc
index bb4febf0..daee9f03 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -1410,7 +1410,10 @@ void take_hit(int damage, cptr hit_from)
 	if (p_ptr->chp < warning)
 	{
 		/* Hack -- bell on first notice */
-		if (alert_hitpoint && (old_chp > warning)) bell();
+		if (old_chp > warning)
+		{
+			bell();
+		}
 
 		sound(SOUND_WARN);
 
@@ -1551,7 +1554,10 @@ void take_sanity_hit(int damage, cptr hit_from)
 	if (p_ptr->csane < warning)
 	{
 		/* Hack -- bell on first notice */
-		if (alert_hitpoint && (old_csane > warning)) bell();
+		if (old_csane > warning)
+		{
+			bell();
+		}
 
 		sound(SOUND_WARN);
 
diff --git a/src/tables.cc b/src/tables.cc
index ba86c577..340919aa 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -1313,9 +1313,6 @@ option_type option_info[] =
 	{ &disturb_other, FALSE, 2, 9,
 	  "disturb_other", "Disturb whenever random things happen" },
 
-	{ &alert_hitpoint, FALSE, 2, 10,
-	  "alert_hitpoint", "Alert user to critical hitpoints" },
-
 	{ &alert_failure, FALSE, 2, 11,
 	  "alert_failure", "Alert user to various failures" },