Split "Ultra Good" quest from plots.c

6 files changed, 16 insertions, 7 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3aea4af5..42468279 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@ SET(SRCS
   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 q_wolves.c q_shroom.c q_nazgul.c q_wight.c
-  q_troll.c q_hobbit.c q_thief.c q_ultrae.c
+  q_troll.c q_hobbit.c q_thief.c q_ultrae.c q_ultrag.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 ed4c65ea..f8a87df4 100644
--- a/src/plots.c
+++ b/src/plots.c
@@ -366,5 +366,4 @@ bool_ quest_null_hook(int q)
 /**************************** Main plot ***************************/
 #include "q_main.c"
 #include "q_one.c"
-#include "q_ultrag.c"
 
diff --git a/src/plots.h b/src/plots.h
index 56253e6d..75a6101c 100644
--- a/src/plots.h
+++ b/src/plots.h
@@ -14,4 +14,3 @@ extern bool_ quest_necro_init_hook(int q_idx);
 extern bool_ quest_one_init_hook(int q_idx);
 extern bool_ quest_sauron_init_hook(int q_idx);
 extern bool_ quest_morgoth_init_hook(int q_idx);
-extern bool_ quest_ultra_good_init_hook(int q_idx);
diff --git a/src/q_ultrag.c b/src/q_ultrag.c
index a5a09f2d..a5d28369 100644
--- a/src/q_ultrag.c
+++ b/src/q_ultrag.c
@@ -1,8 +1,5 @@
-/*
- * Here takes place the Good ultra ending
- */
+#include "q_ultrag.h"
 
-#undef cquest
 #define cquest (quest[QUEST_ULTRA_GOOD])
 
 bool_ quest_ultra_good_move_hook(char *fmt)
diff --git a/src/q_ultrag.h b/src/q_ultrag.h
new file mode 100644
index 00000000..09d9f80c
--- /dev/null
+++ b/src/q_ultrag.h
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "angband.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+bool_ quest_ultra_good_init_hook(int q_idx);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif
diff --git a/src/tables.c b/src/tables.c
index 52fb4db6..68c973c2 100644
--- a/src/tables.c
+++ b/src/tables.c
@@ -34,6 +34,7 @@
 #include "q_hobbit.h"
 #include "q_thief.h"
 #include "q_ultrae.h"
+#include "q_ultrag.h"