summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:59 +0100
committerBardur Arantsson <bardur@scientician.net>2015-02-23 09:11:59 +0100
commit71a3bdb100d427ceedce7b2c8fe94de6181341d1 (patch)
tree8542e37ae3f5b66a16dcbb9e0fe68fefa167aeed
parent6cf4c537d2a3545e7f9579999822ce59557eea28 (diff)
Move store.cc function declarations to separate header
-rw-r--r--src/birth.cc1
-rw-r--r--src/bldg.cc1
-rw-r--r--src/cmd3.cc1
-rw-r--r--src/cmd6.cc1
-rw-r--r--src/dungeon.cc1
-rw-r--r--src/externs.h13
-rw-r--r--src/melee1.cc1
-rw-r--r--src/store.cc2
-rw-r--r--src/store.hpp15
9 files changed, 22 insertions, 14 deletions
diff --git a/src/birth.cc b/src/birth.cc
index efe0b311..290e76e2 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -21,6 +21,7 @@
#include "q_rand.h"
#include "skills.hpp"
#include "spells3.hpp"
+#include "store.hpp"
#include <string>
diff --git a/src/bldg.cc b/src/bldg.cc
index f82e1ef2..354ff342 100644
--- a/src/bldg.cc
+++ b/src/bldg.cc
@@ -19,6 +19,7 @@
#include "q_library.h"
#include "q_fireprof.h"
#include "q_bounty.h"
+#include "store.hpp"
/* hack as in leave_store in store.c */
static bool_ leave_bldg = FALSE;
diff --git a/src/cmd3.cc b/src/cmd3.cc
index 130032bd..443dbb15 100644
--- a/src/cmd3.cc
+++ b/src/cmd3.cc
@@ -16,6 +16,7 @@
#include "hooks.h"
#include "quark.h"
#include "squeltch.hpp"
+#include "store.hpp"
#include <cassert>
#include <algorithm>
diff --git a/src/cmd6.cc b/src/cmd6.cc
index b2150c95..6de4cb4f 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -15,6 +15,7 @@
#include "skills.hpp"
#include "spell_type.hpp"
#include "spells5.hpp"
+#include "store.hpp"
#include <cassert>
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 4266958f..45e6aca0 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -22,6 +22,7 @@
#include "spell_type.hpp"
#include "spells5.hpp"
#include "squeltch.hpp"
+#include "store.hpp"
#include <cassert>
diff --git a/src/externs.h b/src/externs.h
index 6bcdb149..aefcddbe 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1281,19 +1281,6 @@ school_type *school_at(int index);
void mana_school_calc_mana(int *msp);
-/* store.c */
-extern void do_cmd_store(void);
-extern void store_shuffle(int which);
-extern void store_maint(int town_num, int store_num);
-extern void store_init(int town_num, int store_num);
-extern void move_to_black_market(object_type * o_ptr);
-extern void do_cmd_home_trump(void);
-extern void store_sell(void);
-extern void store_purchase(void);
-extern void store_examine(void);
-extern void store_stole(void);
-extern void store_prt_gold(void);
-
/* bldg.c -KMW- */
extern bool_ bldg_process_command(store_type *s_ptr, int i);
extern void show_building(store_type *s_ptr);
diff --git a/src/melee1.cc b/src/melee1.cc
index f7615b28..e25c44c5 100644
--- a/src/melee1.cc
+++ b/src/melee1.cc
@@ -13,6 +13,7 @@
#include "angband.h"
#include "mimic.hpp"
#include "skills.hpp"
+#include "store.hpp"
#include <boost/algorithm/string/predicate.hpp>
diff --git a/src/store.cc b/src/store.cc
index e6cbd433..5b9758b7 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -10,7 +10,7 @@
* included in all such copies.
*/
-#include "angband.h"
+#include "store.hpp"
#include "spell_type.hpp"
#include "quark.h"
#include "hooks.h"
diff --git a/src/store.hpp b/src/store.hpp
new file mode 100644
index 00000000..6a1c03d3
--- /dev/null
+++ b/src/store.hpp
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "angband.h"
+
+extern void do_cmd_store();
+extern void store_shuffle(int which);
+extern void store_maint(int town_num, int store_num);
+extern void store_init(int town_num, int store_num);
+extern void move_to_black_market(object_type * o_ptr);
+extern void do_cmd_home_trump();
+extern void store_sell();
+extern void store_purchase();
+extern void store_examine();
+extern void store_stole();
+extern void store_prt_gold();