summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2015-03-07 16:55:41 +0100
committerBardur Arantsson <bardur@scientician.net>2015-03-07 16:55:41 +0100
commit3d13f588b3927f2a2732959a7702b577a4642d34 (patch)
tree50a55eacdff7bce1345b9f8b171c8efbe9433777
parent5fbaba97d2613e30671a447a10093c4fd9df2e96 (diff)
Split init2.cc declarations to separate header files
-rw-r--r--src/birth.cc1
-rw-r--r--src/dungeon.cc1
-rw-r--r--src/externs.h11
-rw-r--r--src/init1.cc1
-rw-r--r--src/init2.cc3
-rw-r--r--src/init2.h14
-rw-r--r--src/init2.hpp9
-rw-r--r--src/loadsave.cc1
-rw-r--r--src/main-win.c1
-rw-r--r--src/main.c1
-rw-r--r--src/script.cc1
11 files changed, 33 insertions, 11 deletions
diff --git a/src/birth.cc b/src/birth.cc
index f8c5d5f7..6de84478 100644
--- a/src/birth.cc
+++ b/src/birth.cc
@@ -16,6 +16,7 @@
#include "gods.hpp"
#include "help.hpp"
#include "hooks.h"
+#include "init2.hpp"
#include "mimic.hpp"
#include "messages.h"
#include "modules.hpp"
diff --git a/src/dungeon.cc b/src/dungeon.cc
index 771d47c1..b4a12438 100644
--- a/src/dungeon.cc
+++ b/src/dungeon.cc
@@ -27,6 +27,7 @@
#include "gods.hpp"
#include "help.hpp"
#include "hooks.h"
+#include "init2.hpp"
#include "levels.hpp"
#include "loadsave.h"
#include "loadsave.hpp"
diff --git a/src/externs.h b/src/externs.h
index 853951f9..78551007 100644
--- a/src/externs.h
+++ b/src/externs.h
@@ -462,17 +462,6 @@ extern const char *get_version_string();
/* birth.c */
extern bool_ no_begin_screen;
-/* init2.c */
-extern void init_corruptions();
-extern void create_stores_stock(int t);
-extern errr init_v_info(void);
-extern void init_file_paths(char *path);
-extern void init_file_paths_with_env();
-extern void init_angband(void);
-extern errr init_buildings(void);
-extern s16b error_idx;
-extern s16b error_line;
-
/* joke.c */
extern bool_ gen_joke_monsters(void *data, void *in, void *out);
diff --git a/src/init1.cc b/src/init1.cc
index b3b1f22d..cc6c265e 100644
--- a/src/init1.cc
+++ b/src/init1.cc
@@ -4,6 +4,7 @@
#include "cave.hpp"
#include "files.hpp"
#include "gods.hpp"
+#include "init2.hpp"
#include "monster2.hpp"
#include "object1.hpp"
#include "object2.hpp"
diff --git a/src/init2.cc b/src/init2.cc
index 9669279b..d43a0c6d 100644
--- a/src/init2.cc
+++ b/src/init2.cc
@@ -1,3 +1,6 @@
+#include "init2.hpp"
+#include "init2.h"
+
#include "angband.h"
#include "cave.hpp"
#include "files.hpp"
diff --git a/src/init2.h b/src/init2.h
new file mode 100644
index 00000000..5697e4ef
--- /dev/null
+++ b/src/init2.h
@@ -0,0 +1,14 @@
+#pragma once
+
+// C linkage required for these functions since main-* code uses them.
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern void init_file_paths(char *path);
+extern void init_file_paths_with_env();
+extern void init_angband(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/init2.hpp b/src/init2.hpp
new file mode 100644
index 00000000..707a2706
--- /dev/null
+++ b/src/init2.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "h-basic.h"
+
+extern void init_corruptions();
+extern void create_stores_stock(int t);
+extern errr init_v_info(void);
+extern s16b error_idx;
+extern s16b error_line;
diff --git a/src/loadsave.cc b/src/loadsave.cc
index 0080e40c..456ba777 100644
--- a/src/loadsave.cc
+++ b/src/loadsave.cc
@@ -4,6 +4,7 @@
#include "angband.h"
#include "birth.hpp"
#include "init1.hpp"
+#include "init2.hpp"
#include "levels.hpp"
#include "messages.h"
#include "modules.hpp"
diff --git a/src/main-win.c b/src/main-win.c
index 0caecbd5..b532c138 100644
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -70,6 +70,7 @@
#include "angband.h"
#include "dungeon.h"
#include "files.h"
+#include "init2.h"
#include "util.h"
#ifdef WINDOWS
diff --git a/src/main.c b/src/main.c
index f93bcb87..e6a0514f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,6 +11,7 @@
#include "angband.h"
#include "dungeon.h"
#include "files.h"
+#include "init2.h"
#include "util.h"
diff --git a/src/script.cc b/src/script.cc
index 1c1cab68..4c964c0c 100644
--- a/src/script.cc
+++ b/src/script.cc
@@ -11,6 +11,7 @@
*/
#include "angband.h"
+#include "init2.hpp"
#include "q_library.h"
#include "spells4.hpp"
#include "spells5.hpp"