diff options
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plots.c | 3 | ||||
-rw-r--r-- | src/plots.h | 3 | ||||
-rw-r--r-- | src/q_haunted.c | 3 | ||||
-rw-r--r-- | src/q_haunted.h | 13 | ||||
-rw-r--r-- | src/tables.c | 1 |
6 files changed, 17 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 255531bb..6f90cf63 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_narsil.c q_evil.c q_betwen.c q_haunted.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 79b49eed..e26b726b 100644 --- a/src/plots.c +++ b/src/plots.c @@ -387,6 +387,3 @@ bool_ quest_null_hook(int q) #include "q_eol.c" #include "q_nirna.c" #include "q_invas.c" - -/************************* Minas Anor plot ************************/ -#include "q_haunted.c" diff --git a/src/plots.h b/src/plots.h index 4ea20472..3eb18bf3 100644 --- a/src/plots.h +++ b/src/plots.h @@ -36,9 +36,6 @@ 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 Minas Anor *********/ -extern bool_ quest_haunted_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_haunted.c b/src/q_haunted.c index db8992bc..efd5a47c 100644 --- a/src/q_haunted.c +++ b/src/q_haunted.c @@ -1,4 +1,5 @@ -#undef cquest +#include "q_haunted.h" + #define cquest (quest[QUEST_HAUNTED]) bool_ quest_haunted_gen_hook(char *fmt) diff --git a/src/q_haunted.h b/src/q_haunted.h new file mode 100644 index 00000000..332ec199 --- /dev/null +++ b/src/q_haunted.h @@ -0,0 +1,13 @@ +#pragma once + +#include "angband.h" + +#ifdef __cplusplus +extern "C" { +#endif + +bool_ quest_haunted_init_hook(int q_idx); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/src/tables.c b/src/tables.c index 67a35ffd..2fd10764 100644 --- a/src/tables.c +++ b/src/tables.c @@ -18,6 +18,7 @@ #include "q_narsil.h" #include "q_evil.h" #include "q_betwen.h" +#include "q_haunted.h" |