Move cmd4.cc function declarations to separate header file

Remove a little dead code while we're at it.

9 files changed, 36 insertions, 56 deletions

diff --git a/src/birth.cc b/src/birth.cc
index 323c0f63..eb76c838 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -9,6 +9,7 @@
 
 #include "angband.h"
 #include "corrupt.hpp"
+#include "cmd4.hpp"
 #include "gods.hpp"
 #include "help.hpp"
 #include "hooks.h"
diff --git a/src/cmd1.cc b/src/cmd1.cc
index e914e620..52725afc 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -10,6 +10,7 @@
 
 #include "angband.h"
 #include "cave.hpp"
+#include "cmd4.hpp"
 #include "gods.hpp"
 #include "hooks.h"
 #include "mimic.hpp"
diff --git a/src/cmd4.cc b/src/cmd4.cc
index 7afc3a3c..30d2557b 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -5,6 +5,7 @@
  * not for profit purposes provided that this copyright and statement are
  * included in all such copies.
  */
+#include "cmd4.hpp"
 
 #include "angband.h"
 #include "corrupt.hpp"
@@ -735,28 +736,6 @@ static void do_cmd_options_autosave(cptr info)
 	}
 }
 
-/* Switch an option by only knowing its name */
-bool_ change_option(cptr name, bool_ value)
-{
-	int i;
-
-	/* Scan the options */
-	for (i = 0; option_info[i].o_desc; i++)
-	{
-		if (!strcmp(option_info[i].o_text, name))
-		{
-			bool_ old = (*option_info[i].o_var);
-
-			(*option_info[i].o_var) = value;
-
-			return old;
-		}
-	}
-
-	cmsg_format(TERM_VIOLET, "Warning, change_option couldn't find option '%s'.", name);
-	return FALSE;
-}
-
 /*
  * Interact with some options
  */
@@ -3474,7 +3453,7 @@ static void do_cmd_knowledge_uniques(void)
 }
 
 
-void plural_aux(char *name)
+static void plural_aux(char *name)
 {
 	int name_len = strlen(name);
 
diff --git a/src/cmd4.hpp b/src/cmd4.hpp
new file mode 100644
index 00000000..c1675022
--- /dev/null
+++ b/src/cmd4.hpp
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "angband.h"
+
+extern void macro_recorder_start(void);
+extern void macro_recorder_add(char c);
+extern void macro_recorder_stop(void);
+extern void do_cmd_macro_recorder(void);
+extern void do_cmd_redraw(void);
+extern void do_cmd_change_name(void);
+extern void do_cmd_message_one(void);
+extern void do_cmd_messages(void);
+extern void do_cmd_options(void);
+extern void do_cmd_pref(void);
+extern void do_cmd_macros(void);
+extern void do_cmd_visuals(void);
+extern void do_cmd_colors(void);
+extern void do_cmd_note(void);
+extern void do_cmd_version(void);
+extern void do_cmd_feeling(void);
+extern void do_cmd_load_screen(void);
+extern void do_cmd_save_screen(void);
+extern void do_cmd_knowledge(void);
+extern void do_cmd_checkquest(void);
+extern void do_cmd_change_tactic(int i);
+extern void do_cmd_change_movement(int i);
+extern void do_cmd_time(void);
+extern void do_cmd_options_aux(int page, cptr info, bool_ read_only);
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 4ca132d4..a0e56961 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -12,6 +12,7 @@
 #include "cmd1.hpp"
 #include "cmd2.hpp"
 #include "cmd3.hpp"
+#include "cmd4.hpp"
 #include "corrupt.hpp"
 #include "gods.hpp"
 #include "help.hpp"
diff --git a/src/externs.h b/src/externs.h
index 08465398..72900aeb 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -462,35 +462,6 @@ extern const char *get_version_string();
 /* birth.c */
 extern bool_ no_begin_screen;
 
-/* cmd4.c */
-extern bool_ change_option(cptr name, bool_ value);
-extern void macro_recorder_start(void);
-extern void macro_recorder_add(char c);
-extern void macro_recorder_stop(void);
-extern void do_cmd_macro_recorder(void);
-extern void do_cmd_redraw(void);
-extern void do_cmd_change_name(void);
-extern void do_cmd_message_one(void);
-extern void do_cmd_messages(void);
-extern void do_cmd_options(void);
-extern void do_cmd_pref(void);
-extern void do_cmd_macros(void);
-extern void do_cmd_visuals(void);
-extern void do_cmd_colors(void);
-extern void do_cmd_note(void);
-extern void do_cmd_version(void);
-extern void do_cmd_feeling(void);
-extern void do_cmd_load_screen(void);
-extern void do_cmd_save_screen(void);
-extern void do_cmd_knowledge(void);
-extern void plural_aux(char * Name);
-extern void do_cmd_checkquest(void);
-extern void do_cmd_change_tactic(int i);
-extern void do_cmd_change_movement(int i);
-extern void do_cmd_time(void);
-extern void do_cmd_options_aux(int page, cptr info, bool_ read_only);
-
-
 /* cmd5.c */
 extern bool_ is_magestaff(void);
 extern void calc_magic_bonus(void);
diff --git a/src/store.cc b/src/store.cc
index 610017ba..9d9e4a2e 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -11,6 +11,7 @@
 #include "bldg.hpp"
 #include "cave.hpp"
 #include "cmd3.hpp"
+#include "cmd4.hpp"
 #include "hooks.h"
 #include "quark.h"
 #include "spell_type.hpp"
diff --git a/src/util.cc b/src/util.cc
index 1c11e3bf..55badc07 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -5,6 +5,7 @@
 #include "util.hpp"
 #include "angband.h"
 #include "cmd3.hpp"
+#include "cmd4.hpp"
 #include "messages.h"
 #include "quark.h"
 #include "xtra1.hpp"
diff --git a/src/wizard2.cc b/src/wizard2.cc
index 3f99726e..522d6059 100644
--- a/src/wizard2.cc
+++ b/src/wizard2.cc
@@ -1,7 +1,3 @@
-/* File: wizard2.c */
-
-/* Purpose: Wizard commands */
-
 /*
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
  *
@@ -12,6 +8,7 @@
 
 #include "angband.h"
 #include "cave.hpp"
+#include "cmd4.hpp"
 #include "corrupt.hpp"
 #include "hooks.h"
 #include "randart.hpp"