Move skills.cc function declarations to skills.hpp

31 files changed, 70 insertions, 60 deletions

diff --git a/src/birth.cc b/src/birth.cc
index 63bf92ef..a9649eb5 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -18,6 +18,7 @@
 #include "hooks.h"
 #include "mimic.hpp"
 #include "q_rand.h"
+#include "skills.hpp"
 #include "spells3.hpp"
 
 #include <string>
diff --git a/src/cmd1.cc b/src/cmd1.cc
index 1f13baec..0a7f56f6 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -11,6 +11,7 @@
 #include "hooks.h"
 #include "mimic.hpp"
 #include "quark.h"
+#include "skills.hpp"
 #include "spells3.hpp"
 
 #define MAX_VAMPIRIC_DRAIN 100
diff --git a/src/cmd2.cc b/src/cmd2.cc
index 0e56bd58..8279747a 100644
--- a/src/cmd2.cc
+++ b/src/cmd2.cc
@@ -1,7 +1,3 @@
-/* File: cmd2.c */
-
-/* Purpose: Movement commands (part 2) */
-
 /*
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
  *
@@ -13,6 +9,7 @@
 #include "angband.h"
 #include "gods.hpp"
 #include "hooks.h"
+#include "skills.hpp"
 #include "spells3.hpp"
 
 #include <chrono>
diff --git a/src/cmd4.cc b/src/cmd4.cc
index 35809154..a93a48c0 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -1,7 +1,3 @@
-/* File: cmd4.c */
-
-/* Purpose: Interface commands */
-
 /*
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
  *
@@ -12,8 +8,9 @@
 
 #include "angband.h"
 #include "corrupt.hpp"
-#include "messages.h"
 #include "hooks.h"
+#include "messages.h"
+#include "skills.hpp"
 
 #include <cassert>
 #include <memory>
diff --git a/src/cmd5.cc b/src/cmd5.cc
index 25752331..e2cdbd95 100644
--- a/src/cmd5.cc
+++ b/src/cmd5.cc
@@ -1,7 +1,3 @@
-/* File: cmd5.c */
-
-/* Purpose: Class commands */
-
 /*
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
  *
@@ -10,9 +6,9 @@
  * included in all such copies.
  */
 
-
 #include "angband.h"
 #include "corrupt.hpp"
+#include "skills.hpp"
 #include "spell_type.hpp"
 #include "spells5.hpp"
 #include "quark.h"
diff --git a/src/cmd6.cc b/src/cmd6.cc
index 5e5dff2c..f5aca511 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -1,7 +1,3 @@
-/* File: cmd6.c */
-
-/* Purpose: Object commands */
-
 /*
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
  *
@@ -15,6 +11,7 @@
 #include "hooks.h"
 #include "lua_bind.hpp"
 #include "mimic.hpp"
+#include "skills.hpp"
 #include "spell_type.hpp"
 #include "spells5.hpp"
 
diff --git a/src/cmd7.cc b/src/cmd7.cc
index e593e5f0..b78de144 100644
--- a/src/cmd7.cc
+++ b/src/cmd7.cc
@@ -15,6 +15,7 @@
 #include "hooks.h"
 #include "mimic.hpp"
 #include "quark.h"
+#include "skills.hpp"
 
 /*
  * Describe class powers of Mindcrafters
diff --git a/src/dungeon.cc b/src/dungeon.cc
index cadc4595..2a01db9a 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -17,6 +17,7 @@
 #include "modules.hpp"
 #include "quest.h"
 #include "quark.h"
+#include "skills.hpp"
 #include "spell_type.hpp"
 #include "spells5.hpp"
 
diff --git a/src/externs.h b/src/externs.h
index 3ad761f6..6a8728f2 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1607,28 +1607,3 @@ extern timer_type *TIMER_AGGRAVATE_EVIL;
 
 void timer_aggravate_evil_enable();
 void timer_aggravate_evil_callback();
-
-/* skills.c */
-extern void dump_skills(FILE *fff);
-extern s16b find_skill(cptr name);
-extern s16b find_skill_i(cptr name);
-extern s16b get_skill(int skill);
-extern s16b get_skill_scale(int skill, u32b scale);
-extern void do_cmd_skill(void);
-extern void do_cmd_activate_skill(void);
-extern s16b melee_skills[MAX_MELEE];
-extern const char *melee_names[MAX_MELEE];
-extern s16b get_melee_skills(void);
-extern s16b get_melee_skill(void);
-extern bool_ forbid_gloves(void);
-extern bool_ forbid_non_blessed(void);
-extern void compute_skills(s32b *v, s32b *m, int i);
-extern void select_default_melee(void);
-extern void do_get_new_skill(void);
-extern void init_skill(s32b value, s32b mod, int i);
-extern s16b find_ability(cptr name);
-extern void dump_abilities(FILE *fff);
-extern void do_cmd_ability(void);
-extern bool_ has_ability(int ab);
-extern void apply_level_abilities(int level);
-extern void recalc_skills(bool_ init);
diff --git a/src/files.cc b/src/files.cc
index b4810548..9deac4e6 100644
--- a/src/files.cc
+++ b/src/files.cc
@@ -1,7 +1,3 @@
-/* File: files.c */
-
-/* Purpose: code dealing with files (and death) */
-
 /*
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
  *
@@ -15,6 +11,7 @@
 #include "hiscore.h"
 #include "hooks.h"
 #include "mimic.hpp"
+#include "skills.hpp"
 
 #include <memory>
 #include <unordered_set>
diff --git a/src/gods.cc b/src/gods.cc
index 92861d79..ea23f3fb 100644
--- a/src/gods.cc
+++ b/src/gods.cc
@@ -6,7 +6,9 @@
  * included in all such copies.
  */
 #include "gods.hpp"
+
 #include "angband.h"
+#include "skills.hpp"
 
 #include <cassert>
 
diff --git a/src/help.cc b/src/help.cc
index 4c14da9d..8fbaaa4f 100644
--- a/src/help.cc
+++ b/src/help.cc
@@ -13,6 +13,7 @@
 
 #include "angband.h"
 #include "hooks.h"
+#include "skills.hpp"
 
 #define DESC_MAX 14
 #define TRIGGERED_HELP_MAX 19
diff --git a/src/init1.cc b/src/init1.cc
index d975bd24..08287688 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -1,5 +1,6 @@
 #include "angband.h"
 #include "gods.hpp"
+#include "skills.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/lua_bind.cc b/src/lua_bind.cc
index e2fe9c9e..c20a7861 100644
--- a/src/lua_bind.cc
+++ b/src/lua_bind.cc
@@ -13,11 +13,12 @@
 #include "lua_bind.hpp"
 #include "angband.h"
 #include "corrupt.hpp"
+#include "skills.hpp"
 #include "spell_type.hpp"
 #include "spells5.hpp"
 #include "range.h"
 
-#include <assert.h>
+#include <cassert>
 #include <functional>
 
 /*
diff --git a/src/melee1.cc b/src/melee1.cc
index 7ebc0574..f7615b28 100644
--- a/src/melee1.cc
+++ b/src/melee1.cc
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "mimic.hpp"
+#include "skills.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
 
diff --git a/src/melee2.cc b/src/melee2.cc
index de16d2f8..ff3a9150 100644
--- a/src/melee2.cc
+++ b/src/melee2.cc
@@ -17,9 +17,10 @@
 
 #include "angband.h"
 
+#include "hooks.h"
 #include "messages.h"
 #include "quark.h"
-#include "hooks.h"
+#include "skills.hpp"
 
 #include <cassert>
 
diff --git a/src/monster3.cc b/src/monster3.cc
index f5c6a6fb..ea688619 100644
--- a/src/monster3.cc
+++ b/src/monster3.cc
@@ -8,6 +8,7 @@
 
 #include "angband.h"
 #include "gods.hpp"
+#include "skills.hpp"
 
 /*
  * Is the mon,ster in friendly state(pet, friend, ..)
diff --git a/src/object1.cc b/src/object1.cc
index 5248bda4..b5344638 100644
--- a/src/object1.cc
+++ b/src/object1.cc
@@ -11,12 +11,13 @@
  */
 
 #include "angband.h"
+#include "hooks.h"
 #include "lua_bind.hpp"
+#include "mimic.hpp"
 #include "quark.h"
+#include "skills.hpp"
 #include "spell_type.hpp"
-#include "hooks.h"
 #include "spells5.hpp"
-#include "mimic.hpp"
 
 #include <cassert>
 
@@ -4644,7 +4645,7 @@ void show_equip_aux(bool_ mirror, bool_ everything)
 		if ((p_ptr->body_parts[i - INVEN_WIELD] == INVEN_WIELD) &&
 		                !o_ptr->k_idx)
 		{
-			sprintf(o_name, "(%s)", melee_names[get_melee_skill()]);
+			sprintf(o_name, "(%s)", get_melee_name());
 
 			/* Truncate the description */
 			o_name[lim] = 0;
diff --git a/src/object2.cc b/src/object2.cc
index 51ba908d..17806668 100644
--- a/src/object2.cc
+++ b/src/object2.cc
@@ -14,6 +14,7 @@
 #include "spell_type.hpp"
 #include "device_allocation.h"
 #include "hooks.h"
+#include "skills.hpp"
 #include "spells3.hpp"
 #include "spells5.hpp"
 #include "mimic.hpp"
diff --git a/src/q_rand.cc b/src/q_rand.cc
index df1981f8..fd4f8ef6 100644
--- a/src/q_rand.cc
+++ b/src/q_rand.cc
@@ -1,5 +1,6 @@
 #include "q_rand.h"
 #include "hooks.h"
+#include "skills.hpp"
 #include "util.hpp"
 #include "messages.h"
 #include <cassert>
diff --git a/src/skills.cc b/src/skills.cc
index 31897a94..5df8af64 100644
--- a/src/skills.cc
+++ b/src/skills.cc
@@ -608,13 +608,13 @@ void do_cmd_skill()
 /*
  * List of melee skills
  */
-s16b melee_skills[MAX_MELEE] =
+static s16b melee_skills[MAX_MELEE] =
 {
 	SKILL_MASTERY,
 	SKILL_HAND,
 	SKILL_BEAR,
 };
-const char *melee_names[MAX_MELEE] =
+static const char *melee_names[MAX_MELEE] =
 {
 	"Weapon combat",
 	"Barehanded combat",
@@ -635,6 +635,11 @@ s16b get_melee_skill()
 	return (0);
 }
 
+cptr get_melee_name()
+{
+	return melee_names[get_melee_skill()];
+}
+
 s16b get_melee_skills()
 {
 	int i, j = 0;
diff --git a/src/skills.hpp b/src/skills.hpp
new file mode 100644
index 00000000..72ca0c90
--- /dev/null
+++ b/src/skills.hpp
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "angband.h"
+
+extern void dump_skills(FILE *fff);
+extern s16b find_skill(cptr name);
+extern s16b find_skill_i(cptr name);
+extern s16b get_skill(int skill);
+extern s16b get_skill_scale(int skill, u32b scale);
+extern void do_cmd_skill(void);
+extern void do_cmd_activate_skill(void);
+extern cptr get_melee_name();
+extern s16b get_melee_skills(void);
+extern s16b get_melee_skill(void);
+extern bool_ forbid_gloves(void);
+extern bool_ forbid_non_blessed(void);
+extern void compute_skills(s32b *v, s32b *m, int i);
+extern void select_default_melee(void);
+extern void do_get_new_skill(void);
+extern void init_skill(s32b value, s32b mod, int i);
+extern s16b find_ability(cptr name);
+extern void dump_abilities(FILE *fff);
+extern void do_cmd_ability(void);
+extern bool_ has_ability(int ab);
+extern void apply_level_abilities(int level);
+extern void recalc_skills(bool_ init);
diff --git a/src/spells1.cc b/src/spells1.cc
index 809675f8..f2d8c456 100644
--- a/src/spells1.cc
+++ b/src/spells1.cc
@@ -12,6 +12,7 @@
 
 #include "angband.h"
 #include "gods.hpp"
+#include "skills.hpp"
 #include "spell_type.hpp"
 #include "spells5.hpp"
 
diff --git a/src/spells2.cc b/src/spells2.cc
index 2c402ffc..20a095ac 100644
--- a/src/spells2.cc
+++ b/src/spells2.cc
@@ -1,7 +1,3 @@
-/* File: spells2.c */
-
-/* Purpose: Spell code (part 2) */
-
 /*
  * Copyright (c) 1989 James E. Wilson, Robert A. Koeneke
  *
@@ -12,6 +8,7 @@
 
 #include "angband.h"
 #include "hooks.h"
+#include "skills.hpp"
 #include "spells3.hpp"
 
 #include <cassert>
diff --git a/src/spells3.cc b/src/spells3.cc
index 93a958d4..fca0f516 100644
--- a/src/spells3.cc
+++ b/src/spells3.cc
@@ -6,6 +6,7 @@
 
 #include "spell_type.hpp"
 #include "spell_idx_list.hpp"
+#include "skills.hpp"
 #include "mimic.hpp"
 
 #include <vector>
diff --git a/src/spells6.cc b/src/spells6.cc
index a6c72791..ca344f7c 100644
--- a/src/spells6.cc
+++ b/src/spells6.cc
@@ -1,6 +1,7 @@
 #include "angband.h"
 
 #include "gods.hpp"
+#include "skills.hpp"
 #include "spell_type.hpp"
 
 #include <cassert>
diff --git a/src/squelch/condition.cc b/src/squelch/condition.cc
index e608300d..bcaa7ae6 100644
--- a/src/squelch/condition.cc
+++ b/src/squelch/condition.cc
@@ -6,6 +6,7 @@
 #include "tome/squelch/cursor.hpp"
 #include "tome/squelch/tree_printer.hpp"
 #include "angband.h"
+#include "skills.hpp"
 #include "quark.h"
 
 namespace squelch {
diff --git a/src/squelch/condition_metadata.cc b/src/squelch/condition_metadata.cc
index 273d3092..35e1e3f3 100644
--- a/src/squelch/condition_metadata.cc
+++ b/src/squelch/condition_metadata.cc
@@ -5,6 +5,7 @@
 
 #include "tome/squelch/object_status.hpp"
 #include "angband.h"
+#include "skills.hpp"
 
 namespace squelch {
 
diff --git a/src/store.cc b/src/store.cc
index aef29160..6ec2601e 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -14,6 +14,7 @@
 #include "spell_type.hpp"
 #include "quark.h"
 #include "hooks.h"
+#include "skills.hpp"
 #include "spells5.hpp"
 
 #include <cassert>
diff --git a/src/xtra1.cc b/src/xtra1.cc
index 0d53a79f..b7998369 100644
--- a/src/xtra1.cc
+++ b/src/xtra1.cc
@@ -13,10 +13,11 @@
 #include "angband.h"
 #include "corrupt.hpp"
 #include "gods.hpp"
-#include "messages.h"
 #include "hooks.h"
-#include "spells3.hpp"
+#include "messages.h"
 #include "mimic.hpp"
+#include "skills.hpp"
+#include "spells3.hpp"
 
 #include <cassert>
 
diff --git a/src/xtra2.cc b/src/xtra2.cc
index 93cbfe0f..2bdbc507 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -17,6 +17,7 @@
 #include "hooks.h"
 #include "mimic.hpp"
 #include "quark.h"
+#include "skills.hpp"
 
 #include <type_traits>
 #include <cassert>