Split Spider quest from plots.c

6 files changed, 17 insertions, 3 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b607d199..15516dac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,7 @@ SET(SRCS
   q_god.c q_library.c q_fireprof.c q_bounty.c q_thrain.c
   q_narsil.c q_evil.c q_betwen.c q_haunted.c q_invas.c
   q_nirna.c q_eol.c q_god.c q_dragons.c q_poison.c
+  q_spider.c
   object1.c object2.c randart.c squeltch.cc traps.c
   monster1.c monster2.c monster3.c
   xtra1.c xtra2.c skills.c powers.c gods.c
diff --git a/src/plots.c b/src/plots.c
index 2072a391..45f2a87d 100644
--- a/src/plots.c
+++ b/src/plots.c
@@ -379,4 +379,3 @@ bool_ quest_null_hook(int q)
 
 /*************************** Lorien plot **************************/
 #include "q_wolves.c"
-#include "q_spider.c"
diff --git a/src/plots.h b/src/plots.h
index 51db424d..40bdf4d8 100644
--- a/src/plots.h
+++ b/src/plots.h
@@ -27,4 +27,3 @@ extern bool_ quest_shroom_init_hook(int q_idx);
 
 /******* Plot Lorien *********/
 extern bool_ quest_wolves_init_hook(int q_idx);
-extern bool_ quest_spider_init_hook(int q_idx);
diff --git a/src/q_spider.c b/src/q_spider.c
index a739535b..b8731a33 100644
--- a/src/q_spider.c
+++ b/src/q_spider.c
@@ -1,4 +1,5 @@
-#undef cquest
+#include "q_spider.h"
+
 #define cquest (quest[QUEST_SPIDER])
 
 bool_ quest_spider_gen_hook(char *fmt)
diff --git a/src/q_spider.h b/src/q_spider.h
new file mode 100644
index 00000000..2a4dab27
--- /dev/null
+++ b/src/q_spider.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "angband.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool_ quest_spider_init_hook(int q_idx);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/tables.c b/src/tables.c
index 6553490d..cc36f2f6 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -25,6 +25,7 @@
 #include "q_god.h"
 #include "q_dragons.h"
 #include "q_poison.h"
+#include "q_spider.h"