summaryrefslogtreecommitdiff
path: root/src
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
commit995f836a572e7b6ae2a61d40a5766f0a7d586533 (patch)
treea723401367eb514a00fc844bbb233326ec66b7fb /src
parentfbef93c2d3a01a80f6fb702faf1f43360caf9f5b (diff)
Move randart.cc declarations to separate header
Diffstat (limited to 'src')
-rw-r--r--src/cmd6.cc1
-rw-r--r--src/externs.h6
-rw-r--r--src/generate.cc1
-rw-r--r--src/init2.cc3
-rw-r--r--src/monster2.cc1
-rw-r--r--src/object2.cc1
-rw-r--r--src/q_thrain.cc5
-rw-r--r--src/randart.cc6
-rw-r--r--src/randart.hpp8
-rw-r--r--src/wizard2.cc1
-rw-r--r--src/xtra2.cc1
11 files changed, 21 insertions, 13 deletions
diff --git a/src/cmd6.cc b/src/cmd6.cc
index f5aca511..b2150c95 100644
--- a/src/cmd6.cc
+++ b/src/cmd6.cc
@@ -11,6 +11,7 @@
#include "hooks.h"
#include "lua_bind.hpp"
#include "mimic.hpp"
+#include "randart.hpp"
#include "skills.hpp"
#include "spell_type.hpp"
#include "spells5.hpp"
diff --git a/src/externs.h b/src/externs.h
index 0e060129..cfdb765d 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -1281,12 +1281,6 @@ school_type *school_at(int index);
void mana_school_calc_mana(int *msp);
-/* randart.c */
-extern int get_activation_power(void);
-extern void build_prob(cptr learn);
-extern bool_ create_artifact(object_type *o_ptr, bool_ a_scroll, bool_ get_name);
-extern bool_ artifact_scroll(void);
-
/* store.c */
extern bool_ is_blessed(object_type *o_ptr);
extern void do_cmd_store(void);
diff --git a/src/generate.cc b/src/generate.cc
index ada0a15f..acaf5c1b 100644
--- a/src/generate.cc
+++ b/src/generate.cc
@@ -12,6 +12,7 @@
#include "angband.h"
#include "hooks.h"
+#include "randart.hpp"
#include <cassert>
#include <memory>
diff --git a/src/init2.cc b/src/init2.cc
index 2796d398..38423518 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -7,9 +7,10 @@
#include "messages.h"
#include "quark.h"
#include "hooks.h"
-#include "tome/make_array.hpp"
+#include "randart.hpp"
#include "spells3.hpp"
#include "squeltch.hpp"
+#include "tome/make_array.hpp"
#include <cassert>
#include <type_traits>
diff --git a/src/monster2.cc b/src/monster2.cc
index 807998e3..b5f92b4a 100644
--- a/src/monster2.cc
+++ b/src/monster2.cc
@@ -13,6 +13,7 @@
#include "angband.h"
#include "hooks.h"
#include "mimic.hpp"
+#include "randart.hpp"
#include <algorithm>
#include <string>
diff --git a/src/object2.cc b/src/object2.cc
index 17806668..4dad14ad 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 "randart.hpp"
#include "skills.hpp"
#include "spells3.hpp"
#include "spells5.hpp"
diff --git a/src/q_thrain.cc b/src/q_thrain.cc
index d505f1f5..ba5ba56b 100644
--- a/src/q_thrain.cc
+++ b/src/q_thrain.cc
@@ -1,7 +1,10 @@
#include "q_thrain.h"
+
+#include "hooks.h"
#include "quark.h"
+#include "randart.hpp"
#include "messages.h"
-#include "hooks.h"
+
#include <cassert>
#define cquest (quest[QUEST_THRAIN])
diff --git a/src/randart.cc b/src/randart.cc
index 57e7a536..4ac8df8d 100644
--- a/src/randart.cc
+++ b/src/randart.cc
@@ -1,7 +1,3 @@
-/* File: randart.c */
-
-/* Purpose: Randart creation code */
-
/*
* Copyright (c) 2001 DarkGod
*
@@ -10,7 +6,7 @@
* included in all such copies.
*/
-#include "angband.h"
+#include "randart.hpp"
#include "mimic.hpp"
#include "quark.h"
diff --git a/src/randart.hpp b/src/randart.hpp
new file mode 100644
index 00000000..b24987b5
--- /dev/null
+++ b/src/randart.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "angband.h"
+
+extern int get_activation_power(void);
+extern void build_prob(cptr learn);
+extern bool_ create_artifact(object_type *o_ptr, bool_ a_scroll, bool_ get_name);
+extern bool_ artifact_scroll(void);
diff --git a/src/wizard2.cc b/src/wizard2.cc
index 338a9c86..4559307b 100644
--- a/src/wizard2.cc
+++ b/src/wizard2.cc
@@ -13,6 +13,7 @@
#include "angband.h"
#include "corrupt.hpp"
#include "hooks.h"
+#include "randart.hpp"
#include "status.hpp"
/*
diff --git a/src/xtra2.cc b/src/xtra2.cc
index ea6e7c81..cba66982 100644
--- a/src/xtra2.cc
+++ b/src/xtra2.cc
@@ -18,6 +18,7 @@
#include "mimic.hpp"
#include "notes.hpp"
#include "quark.h"
+#include "randart.hpp"
#include "skills.hpp"
#include <type_traits>