Split Khazad-dum quest from plots.c

6 files changed, 17 insertions, 8 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8dc8c234..2b930392 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ SET(SRCS
   variable.c tables.c plots.c util.c cave.c dungeon.c 
   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_narsil.c q_evil.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 19c6afcb..c8f007b2 100644
--- a/src/plots.c
+++ b/src/plots.c
@@ -391,6 +391,3 @@ bool_ quest_null_hook(int q)
 /************************* Minas Anor plot ************************/
 #include "q_haunted.c"
 #include "q_betwen.c"
-
-/************************* Khazad-dum plot ************************/
-#include "q_evil.c"
diff --git a/src/plots.h b/src/plots.h
index 7c0b8b00..f4e6fac3 100644
--- a/src/plots.h
+++ b/src/plots.h
@@ -40,9 +40,6 @@ extern bool_ quest_invasion_init_hook(int q_idx);
 extern bool_ quest_haunted_init_hook(int q_idx);
 extern bool_ quest_between_init_hook(int q_idx);
 
-/******* Plot Khazad-dum *********/
-extern bool_ quest_evil_init_hook(int q_idx);
-
 /******* Plot God Quest **************/
 extern bool_ quest_god_describe(FILE *);
 extern bool_ quest_god_init_hook(int q);
diff --git a/src/q_evil.c b/src/q_evil.c
index a143f65c..4f4d59cd 100644
--- a/src/q_evil.c
+++ b/src/q_evil.c
@@ -1,4 +1,5 @@
-#undef cquest
+#include "q_evil.h"
+
 #define cquest (quest[QUEST_EVIL])
 
 bool_ quest_evil_gen_hook(char *fmt)
diff --git a/src/q_evil.h b/src/q_evil.h
new file mode 100644
index 00000000..8b6739e9
--- /dev/null
+++ b/src/q_evil.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "angband.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool_ quest_evil_init_hook(int q_idx);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/tables.c b/src/tables.c
index bd399994..cfb2c867 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -16,6 +16,7 @@
 #include "q_bounty.h"
 #include "q_thrain.h"
 #include "q_narsil.h"
+#include "q_evil.h"