Remove speak_unique option

6 files changed, 27 insertions, 35 deletions

diff --git a/src/externs.h b/src/externs.h
index e7d2f1ac..872206a7 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -243,7 +243,6 @@ extern bool_ cheat_xtra;
 extern bool_ cheat_know;
 extern bool_ cheat_live;
 extern bool_ last_words;              /* Zangband options */
-extern bool_ speak_unique;
 extern bool_ small_levels;
 extern bool_ empty_levels;
 extern bool_ always_small_level;
diff --git a/src/melee2.cc b/src/melee2.cc
index f3dc1301..8479f68b 100644
--- a/src/melee2.cc
+++ b/src/melee2.cc
@@ -6405,42 +6405,39 @@ static void process_monster(int m_idx, bool_ is_frien)
 		if (ai_multiply(m_idx)) return;
 	}
 
-	if (speak_unique)
+	if (randint(SPEAK_CHANCE) == 1)
 	{
-		if (randint(SPEAK_CHANCE) == 1)
+		if (player_has_los_bold(oy, ox) && (r_ptr->flags2 & RF2_CAN_SPEAK))
 		{
-			if (player_has_los_bold(oy, ox) && (r_ptr->flags2 & RF2_CAN_SPEAK))
-			{
-				char m_name[80];
-				char monmessage[80];
+			char m_name[80];
+			char monmessage[80];
 
-				/* Acquire the monster name/poss */
-				if (m_ptr->ml)
-					monster_desc(m_name, m_ptr, 0);
-				else
-					strcpy(m_name, "It");
+			/* Acquire the monster name/poss */
+			if (m_ptr->ml)
+				monster_desc(m_name, m_ptr, 0);
+			else
+				strcpy(m_name, "It");
 
-				/* xtra_line function by Matt Graham--allow uniques to */
-				/* say "unique" things based on their monster index.   */
-				/* Try for the unique's lines in "monspeak.txt" first. */
-				/* 0 is SUCCESS, of course....                         */
+			/* xtra_line function by Matt Graham--allow uniques to */
+			/* say "unique" things based on their monster index.   */
+			/* Try for the unique's lines in "monspeak.txt" first. */
+			/* 0 is SUCCESS, of course....                         */
 
-				struct hook_mon_speak_in in = { m_idx, m_name };
-				if (!process_hooks_new(HOOK_MON_SPEAK, &in, NULL))
+			struct hook_mon_speak_in in = { m_idx, m_name };
+			if (!process_hooks_new(HOOK_MON_SPEAK, &in, NULL))
+			{
+				if (get_xtra_line("monspeak.txt", m_ptr, monmessage) != 0)
 				{
-					if (get_xtra_line("monspeak.txt", m_ptr, monmessage) != 0)
-					{
-						/* Get a message from old defaults if new don't work */
+					/* Get a message from old defaults if new don't work */
 
-						if (is_friend(m_ptr) > 0)
-							get_rnd_line("speakpet.txt", monmessage);
-						else if (m_ptr->monfear)
-							get_rnd_line("monfear.txt", monmessage);
-						else
-							get_rnd_line("bravado.txt", monmessage);
-					}
-					msg_format("%^s %s", m_name, monmessage);
+					if (is_friend(m_ptr) > 0)
+						get_rnd_line("speakpet.txt", monmessage);
+					else if (m_ptr->monfear)
+						get_rnd_line("monfear.txt", monmessage);
+					else
+						get_rnd_line("bravado.txt", monmessage);
 				}
+				msg_format("%^s %s", m_name, monmessage);
 			}
 		}
 	}
diff --git a/src/store.cc b/src/store.cc
index aeec0069..15c97d1d 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -76,7 +76,7 @@ static void say_comment_1(void)
 
 	msg_print(comment_1[rand_int(MAX_COMMENT_1)]);
 
-	if (randint(RUMOR_CHANCE) == 1 && speak_unique)
+	if (randint(RUMOR_CHANCE) == 1)
 	{
 		msg_print("The shopkeeper whispers something into your ear:");
 		get_rnd_line("rumors.txt", rumour);
diff --git a/src/tables.cc b/src/tables.cc
index e1044977..1cec4611 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -1445,9 +1445,6 @@ option_type option_info[] =
 	{ &last_words, TRUE, 2, 12,
 	  "last_words", "Get last words when the character dies" },
 
-	{ &speak_unique, TRUE, 2, 13,
-	  "speak_unique", "Allow shopkeepers and uniques to speak" },
-
 	{ &auto_destroy, TRUE, 2, 14,
 	  "auto_destroy", "No query to destroy known worthless items" },
 
diff --git a/src/variable.cc b/src/variable.cc
index fb2b9984..ce4db76b 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -202,7 +202,6 @@ 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_ speak_unique; 		/* Speaking uniques + shopkeepers */
 bool_ small_levels; 		/* Allow unusually small dungeon levels */
 bool_ empty_levels; 		/* Allow empty 'arena' levels */
 bool_ always_small_level;         /* Small levels */
diff --git a/src/xtra2.cc b/src/xtra2.cc
index 19ac33e7..2fb56f59 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -3246,7 +3246,7 @@ bool_ mon_take_hit(int m_idx, int dam, bool_ *fear, cptr note)
 			while (--curses);
 		}
 
-		if (speak_unique && (r_ptr->flags2 & (RF2_CAN_SPEAK)))
+		if (r_ptr->flags2 & (RF2_CAN_SPEAK))
 		{
 			char line_got[80];
 			/* Dump a message */