Split "Invasion of Gondolin" quest from plots.c

6 files changed, 17 insertions, 4 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6f90cf63..c41f3019 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_evil.c q_betwen.c q_haunted.c
+  q_narsil.c q_evil.c q_betwen.c q_haunted.c q_invas.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 e26b726b..5cc0ef1c 100644
--- a/src/plots.c
+++ b/src/plots.c
@@ -386,4 +386,3 @@ bool_ quest_null_hook(int q)
 #include "q_dragons.c"
 #include "q_eol.c"
 #include "q_nirna.c"
-#include "q_invas.c"
diff --git a/src/plots.h b/src/plots.h
index 3eb18bf3..737972a5 100644
--- a/src/plots.h
+++ b/src/plots.h
@@ -34,7 +34,6 @@ extern bool_ quest_poison_init_hook(int q_idx);
 extern bool_ quest_dragons_init_hook(int q_idx);
 extern bool_ quest_eol_init_hook(int q_idx);
 extern bool_ quest_nirnaeth_init_hook(int q_idx);
-extern bool_ quest_invasion_init_hook(int q_idx);
 
 /******* Plot God Quest **************/
 extern bool_ quest_god_describe(FILE *);
diff --git a/src/q_invas.c b/src/q_invas.c
index 985062af..5a52457f 100644
--- a/src/q_invas.c
+++ b/src/q_invas.c
@@ -1,4 +1,5 @@
-#undef cquest
+#include "q_invas.h"
+
 #define cquest (quest[QUEST_INVASION])
 
 bool_ quest_invasion_gen_hook(char *fmt)
diff --git a/src/q_invas.h b/src/q_invas.h
new file mode 100644
index 00000000..dc34e76a
--- /dev/null
+++ b/src/q_invas.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "angband.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool_ quest_invasion_init_hook(int q_idx);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/tables.c b/src/tables.c
index 2fd10764..b6bcb668 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -19,6 +19,7 @@
 #include "q_evil.h"
 #include "q_betwen.h"
 #include "q_haunted.h"
+#include "q_invas.h"