Remove auto_notes and take_notes options

We always set them to TRUE now.

9 files changed, 43 insertions, 78 deletions

diff --git a/src/birth.c b/src/birth.c
index b219a1a0..9e7629c2 100644
--- a/src/birth.c
+++ b/src/birth.c
@@ -3466,10 +3466,7 @@ void player_birth(void)
 	select_default_melee();
 
 	/* Make a note file if that option is set */
-	if (take_notes)
-	{
-		add_note_type(NOTE_BIRTH);
-	}
+	add_note_type(NOTE_BIRTH);
 
 	/* Note player birth in the message recall */
 	message_add(" ", TERM_L_BLUE);
diff --git a/src/cmd4.c b/src/cmd4.c
index e9db67d5..da606cc6 100644
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -2788,16 +2788,8 @@ void do_cmd_note(void)
 	/* Ignore empty notes */
 	if (!buf[0] || (buf[0] == ' ')) return;
 
-	if (take_notes)
-	{
-		/* Add note to file */
-		add_note(buf, ' ');
-	}
-	else
-	{
-		/* Add note to message recall */
-		msg_format("Note: %s", buf);
-	}
+	/* Add note to file */
+	add_note(buf, ' ');
 }
 
 
@@ -4270,7 +4262,7 @@ void do_cmd_knowledge(void)
 		prt("(9) Display current fates", 12, 5);
 		prt("(0) Display known traps", 13, 5);
 		prt("(A) Display known dungeon towns", 14, 5);
-		if (take_notes) prt("(B) Display notes", 15, 5);
+		prt("(B) Display notes", 15, 5);
 
 		/* Prompt */
 		prt("Command: ", 17, 0);
@@ -4376,8 +4368,7 @@ void do_cmd_knowledge(void)
 		case 'B':
 		case 'b':
 			{
-				if (take_notes) do_cmd_knowledge_notes();
-				else bell();
+				do_cmd_knowledge_notes();
 
 				break;
 			}
diff --git a/src/dungeon.c b/src/dungeon.c
index de1a51fe..8df85977 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -5597,7 +5597,7 @@ void play_game(bool_ new_game)
 	};
 
 	/* Hack - if note file exists, load it */
-	if (!new_game && take_notes)
+	if (!new_game)
 	{
 		add_note_type(NOTE_ENTER_DUNGEON);
 	}
diff --git a/src/externs.h b/src/externs.h
index 655da661..5fdd41e0 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -510,7 +510,6 @@ extern bool_ autoroll;
 extern bool_ point_based;
 extern bool_ maximize, preserve, special_lvls, ironman_rooms;
 extern bool_ inventory_no_move;
-extern bool_ take_notes, auto_notes;
 extern bool_ *m_allow_special;
 extern bool_ *k_allow_special;
 extern bool_ *a_allow_special;
diff --git a/src/files.c b/src/files.c
index 7b1d10ce..cc209524 100644
--- a/src/files.c
+++ b/src/files.c
@@ -5533,11 +5533,8 @@ void close_game(void)
 		/* Handle retirement */
 		if (total_winner)
 		{
-			/* Write a note, if that option is on */
-			if (take_notes)
-			{
-				add_note_type(NOTE_WINNER);
-			}
+			/* Make a note */
+			add_note_type(NOTE_WINNER);
 
 			kingly();
 		}
@@ -5554,8 +5551,7 @@ void close_game(void)
 		/* Show more info */
 		show_info();
 
-		/* Write a note */
-		if (take_notes)
+		/* Make a note */
 		{
 			char long_day[30];
 			char buf[80];
@@ -5585,11 +5581,8 @@ void close_game(void)
 		/* Save the game */
 		do_cmd_save_game();
 
-		/* If note-taking enabled, write session end to notes file */
-		if (take_notes)
-		{
-			add_note_type(NOTE_SAVE_GAME);
-		}
+		/* Make a note pf session end */
+		add_note_type(NOTE_SAVE_GAME);
 
 		/* Prompt for scores XXX XXX XXX */
 		prt("Press Return (or Escape).", 0, 40);
diff --git a/src/spells2.c b/src/spells2.c
index 19fb9f8f..8778e49f 100644
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4253,6 +4253,29 @@ static bool_ item_tester_hook_unknown(object_type *o_ptr)
 }
 
 
+
+
+/*
+ * Make note of found artifacts.
+ */
+static void note_found_object(object_type *o_ptr)
+{
+	char note[150];
+	char item_name[80];
+
+	if (artifact_p(o_ptr) || o_ptr->name1)
+	{
+		object_desc(item_name, o_ptr, FALSE, 0);
+
+		/* Build note and write */
+		sprintf(note, "Found The %s", item_name);
+		add_note(note, 'A');
+	}
+}
+
+
+
+
 /*
  * Identify an object in the inventory (or on the floor)
  * This routine does *not* automatically combine objects.
@@ -4310,17 +4333,9 @@ bool_ ident_spell(void)
 		           o_name);
 	}
 
-	/* If the item was an artifact, and if the auto-note is selected, write a message. */
-	if (take_notes && auto_notes && (artifact_p(o_ptr) || o_ptr->name1))
-	{
-		char note[150];
-		char item_name[80];
-		object_desc(item_name, o_ptr, FALSE, 0);
+	/* Make note of found artifacts */
+	note_found_object(o_ptr);
 
-		/* Build note and write */
-		sprintf(note, "Found The %s", item_name);
-		add_note(note, 'A');
-	}
 	/* Process the appropriate hooks */
 	identify_hooks(item, o_ptr, IDENT_NORMAL);
 
@@ -4346,17 +4361,9 @@ bool_ ident_all(void)
 		object_aware(o_ptr);
 		object_known(o_ptr);
 
-		/* If the item was an artifact, and if the auto-note is selected, write a message. */
-		if (take_notes && auto_notes && (artifact_p(o_ptr) || o_ptr->name1))
-		{
-			char note[150];
-			char item_name[80];
-			object_desc(item_name, o_ptr, FALSE, 0);
+		/* Make note of found artifacts */
+		note_found_object(o_ptr);
 
-			/* Build note and write */
-			sprintf(note, "Found The %s", item_name);
-			add_note(note, 'A');
-		}
 		/* Process the appropriate hooks */
 		identify_hooks(-i, o_ptr, IDENT_NORMAL);
 	}
@@ -4428,17 +4435,8 @@ bool_ identify_fully(void)
 		           o_name);
 	}
 
-	/* If the item was an artifact, and if the auto-note is selected, write a message. */
-	if (take_notes && auto_notes && (artifact_p(o_ptr) || o_ptr->name1))
-	{
-		char note[150];
-		char item_name[80];
-		object_desc(item_name, o_ptr, FALSE, 0);
-
-		/* Build note and write */
-		sprintf(note, "Found The %s", item_name);
-		add_note(note, 'A');
-	}
+	/* Make note of found artifacts */
+	note_found_object(o_ptr);
 
 	/* Describe it fully */
 	object_out_desc(o_ptr, NULL, FALSE, TRUE);
diff --git a/src/tables.c b/src/tables.c
index 2e01284a..2087c64e 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -1598,12 +1598,6 @@ option_type option_info[] =
 	{ &ironman_rooms, FALSE, 6, 6,
 	  "ironman_rooms", "Always generate very unusual rooms" },
 
-	{ &take_notes, TRUE, 6, 7,
-	  "take_notes", "Allow notes to be written to a file" },
-
-	{ &auto_notes, TRUE, 6, 8,
-	  "auto_notes", "Automatically note important events" },
-
 	{ &joke_monsters, FALSE, 6, 14,
 	  "joke_monsters", "Allow use of some 'joke' monsters" },
 
diff --git a/src/variable.c b/src/variable.c
index c77c3c7a..08cabd39 100644
--- a/src/variable.c
+++ b/src/variable.c
@@ -1272,9 +1272,6 @@ bool_ maximize, preserve, special_lvls, ironman_rooms;
  * selections */
 bool_ inventory_no_move;
 
-/* Notes patch */
-bool_ take_notes, auto_notes;
-
 /*
  * Such an ugly hack ...
  */
diff --git a/src/xtra2.c b/src/xtra2.c
index a0d500f2..f437c6d1 100644
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2089,11 +2089,7 @@ void check_experience(void)
 		/* Gain this level's abilities */
 		apply_level_abilities(p_ptr->lev);
 
-		/* If auto-note taking enabled, write a note to the file.
-		 * Only write this note when the level is gained for the first
-		 * time.
-		 */
-		if (take_notes && auto_notes)
+		/* Note level gain */
 		{
 			char note[80];
 
@@ -3437,8 +3433,8 @@ bool_ mon_take_hit(int m_idx, int dam, bool_ *fear, cptr note)
 			}
 		}
 
-		/* If the player kills a Unique, and the notes options are on, write a note */
-		if ((r_ptr->flags1 & RF1_UNIQUE) && take_notes && auto_notes)
+		/* Make note of unique kills */
+		if (r_ptr->flags1 & RF1_UNIQUE)
 		{
 			char note[80];