Move tvals[] to tables.cc

4 files changed, 55 insertions, 55 deletions

diff --git a/src/tables.cc b/src/tables.cc
index 7f7a7b8e..54be6b45 100644
--- a/src/tables.cc
+++ b/src/tables.cc
@@ -3770,6 +3770,60 @@ monster_power monster_powers[] =
 		{ SF_S_WRAITH_IDX, "Summon Wraith", 90, TRUE },
 	};
 
+
+/*
+ * A list of tvals and their textual names
+ */
+tval_desc tvals[] =
+{
+        { TV_SWORD, "Sword" },
+        { TV_POLEARM, "Polearm" },
+        { TV_HAFTED, "Hafted Weapon" },
+        { TV_AXE, "Axe" },
+        { TV_BOW, "Bow" },
+        { TV_BOOMERANG, "Boomerang" },
+        { TV_ARROW, "Arrows" },
+        { TV_BOLT, "Bolts" },
+        { TV_SHOT, "Shots" },
+        { TV_SHIELD, "Shield" },
+        { TV_CROWN, "Crown" },
+        { TV_HELM, "Helm" },
+        { TV_GLOVES, "Gloves" },
+        { TV_BOOTS, "Boots" },
+        { TV_CLOAK, "Cloak" },
+        { TV_DRAG_ARMOR, "Dragon Scale Mail" },
+        { TV_HARD_ARMOR, "Hard Armor" },
+        { TV_SOFT_ARMOR, "Soft Armor" },
+        { TV_RING, "Ring" },
+        { TV_AMULET, "Amulet" },
+        { TV_LITE, "Lite" },
+        { TV_POTION, "Potion" },
+        { TV_POTION2, "Potion" },
+        { TV_SCROLL, "Scroll" },
+        { TV_WAND, "Wand" },
+        { TV_STAFF, "Staff" },
+        { TV_ROD_MAIN, "Rod" },
+        { TV_ROD, "Rod Tip" },
+        { TV_BOOK, "Schools Spellbook", },
+        { TV_SYMBIOTIC_BOOK, "Symbiotic Spellbook", },
+        { TV_DRUID_BOOK, "Elemental Stone" },
+        { TV_MUSIC_BOOK, "Music Book" },
+        { TV_DAEMON_BOOK, "Daemon Book" },
+        { TV_SPIKE, "Spikes" },
+        { TV_DIGGING, "Digger" },
+        { TV_CHEST, "Chest" },
+        { TV_FOOD, "Food" },
+        { TV_FLASK, "Flask" },
+        { TV_MSTAFF, "Mage Staff" },
+        { TV_PARCHMENT, "Parchment" },
+        { TV_INSTRUMENT, "Musical Instrument" },
+        { TV_RUNE1, "Rune 1" },
+        { TV_RUNE2, "Rune 2" },
+        { TV_JUNK, "Junk" },
+        { TV_TRAPKIT, "Trapping Kit" },
+        { 0, NULL }
+};
+
 /* Tval descriptions */
 tval_desc tval_descs[] =
 {
diff --git a/src/tables.hpp b/src/tables.hpp
index ab4fd00c..6b9d59b2 100644
--- a/src/tables.hpp
+++ b/src/tables.hpp
@@ -69,6 +69,7 @@ extern std::vector<flags_group> const &flags_groups();
 extern power_type powers_type[POWER_MAX];
 extern cptr artifact_names_list;
 extern monster_power monster_powers[MONSTER_POWERS_MAX];
+extern tval_desc tvals[];
 extern tval_desc tval_descs[];
 extern between_exit between_exits[MAX_BETWEEN_EXITS];
 extern int month_day[9];
diff --git a/src/variable.cc b/src/variable.cc
index 941bc9a0..ccb8556d 100644
--- a/src/variable.cc
+++ b/src/variable.cc
@@ -948,56 +948,3 @@ const char *get_version_string()
 	}
 	return version_str;
 }
-
-/*
- * A list of tvals and their textual names
- */
-tval_desc tvals[] =
-{
-	{ TV_SWORD, "Sword" },
-	{ TV_POLEARM, "Polearm" },
-	{ TV_HAFTED, "Hafted Weapon" },
-	{ TV_AXE, "Axe" },
-	{ TV_BOW, "Bow" },
-	{ TV_BOOMERANG, "Boomerang" },
-	{ TV_ARROW, "Arrows" },
-	{ TV_BOLT, "Bolts" },
-	{ TV_SHOT, "Shots" },
-	{ TV_SHIELD, "Shield" },
-	{ TV_CROWN, "Crown" },
-	{ TV_HELM, "Helm" },
-	{ TV_GLOVES, "Gloves" },
-	{ TV_BOOTS, "Boots" },
-	{ TV_CLOAK, "Cloak" },
-	{ TV_DRAG_ARMOR, "Dragon Scale Mail" },
-	{ TV_HARD_ARMOR, "Hard Armor" },
-	{ TV_SOFT_ARMOR, "Soft Armor" },
-	{ TV_RING, "Ring" },
-	{ TV_AMULET, "Amulet" },
-	{ TV_LITE, "Lite" },
-	{ TV_POTION, "Potion" },
-	{ TV_POTION2, "Potion" },
-	{ TV_SCROLL, "Scroll" },
-	{ TV_WAND, "Wand" },
-	{ TV_STAFF, "Staff" },
-	{ TV_ROD_MAIN, "Rod" },
-	{ TV_ROD, "Rod Tip" },
-	{ TV_BOOK, "Schools Spellbook", },
-	{ TV_SYMBIOTIC_BOOK, "Symbiotic Spellbook", },
-	{ TV_DRUID_BOOK, "Elemental Stone" },
-	{ TV_MUSIC_BOOK, "Music Book" },
-	{ TV_DAEMON_BOOK, "Daemon Book" },
-	{ TV_SPIKE, "Spikes" },
-	{ TV_DIGGING, "Digger" },
-	{ TV_CHEST, "Chest" },
-	{ TV_FOOD, "Food" },
-	{ TV_FLASK, "Flask" },
-	{ TV_MSTAFF, "Mage Staff" },
-	{ TV_PARCHMENT, "Parchment" },
-	{ TV_INSTRUMENT, "Musical Instrument" },
-	{ TV_RUNE1, "Rune 1" },
-	{ TV_RUNE2, "Rune 2" },
-	{ TV_JUNK, "Junk" },
-	{ TV_TRAPKIT, "Trapping Kit" },
-	{ 0, NULL }
-};
diff --git a/src/variable.hpp b/src/variable.hpp
index 20dcbaea..877ad3ce 100644
--- a/src/variable.hpp
+++ b/src/variable.hpp
@@ -45,7 +45,6 @@
 #include "timer_type_fwd.hpp"
 #include "town_type_fwd.hpp"
 #include "trap_type_fwd.hpp"
-#include "tval_desc.hpp"
 #include "vault_type_fwd.hpp"
 #include "wilderness_type_info_fwd.hpp"
 #include "seed.hpp"
@@ -280,7 +279,6 @@ extern s32b DUNGEON_ASTRAL_WILD_Y;
 extern deity_type deity_info[MAX_GODS];
 extern timer_type *gl_timers;
 extern const char *get_version_string();
-extern tval_desc tvals[];
 extern hist_type *bg;
 extern bool_ arg_wizard;
 extern bool_ arg_force_original;