Split "Dragons!" quest from plots.c

6 files changed, 17 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1bf537b5..de4be38d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,7 @@ SET(SRCS
   melee1.c melee2.c messages.c modules.c
   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_nirna.c q_eol.c q_god.c q_dragons.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 683fca7d..b78d9362 100644
--- a/src/plots.c
+++ b/src/plots.c
@@ -381,6 +381,3 @@ bool_ quest_null_hook(int q)
 #include "q_wolves.c"
 #include "q_spider.c"
 #include "q_poison.c"
-
-/************************** Gondolin plot *************************/
-#include "q_dragons.c"
diff --git a/src/plots.h b/src/plots.h
index 6fb521db..56c2a61b 100644
--- a/src/plots.h
+++ b/src/plots.h
@@ -29,6 +29,3 @@ extern bool_ quest_shroom_init_hook(int q_idx);
 extern bool_ quest_wolves_init_hook(int q_idx);
 extern bool_ quest_spider_init_hook(int q_idx);
 extern bool_ quest_poison_init_hook(int q_idx);
-
-/******* Plot Gondolin *********/
-extern bool_ quest_dragons_init_hook(int q_idx);
diff --git a/src/q_dragons.c b/src/q_dragons.c
index 025e8ecd..cd6ebf2c 100644
--- a/src/q_dragons.c
+++ b/src/q_dragons.c
@@ -1,4 +1,5 @@
-#undef cquest
+#include "q_dragons.h"
+
 #define cquest (quest[QUEST_DRAGONS])
 
 bool_ quest_dragons_gen_hook(char *fmt)
diff --git a/src/q_dragons.h b/src/q_dragons.h
new file mode 100644
index 00000000..2d3acc5a
--- /dev/null
+++ b/src/q_dragons.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "angband.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool_ quest_dragons_init_hook(int q_idx);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/tables.c b/src/tables.c
index f8f22870..160594d7 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -23,6 +23,7 @@
 #include "q_nirna.h"
 #include "q_eol.h"
 #include "q_god.h"
+#include "q_dragons.h"