diff options
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plots.c | 1 | ||||
-rw-r--r-- | src/plots.h | 1 | ||||
-rw-r--r-- | src/q_hobbit.c | 4 | ||||
-rw-r--r-- | src/q_hobbit.h | 13 | ||||
-rw-r--r-- | src/tables.c | 1 |
6 files changed, 18 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef6f04b6..6f0974f3 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_troll.c q_hobbit.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 8fecd439..51b986a3 100644 --- a/src/plots.c +++ b/src/plots.c @@ -371,4 +371,3 @@ bool_ quest_null_hook(int q) /**************************** Bree plot ***************************/ #include "q_thief.c" -#include "q_hobbit.c" diff --git a/src/plots.h b/src/plots.h index d3710037..47d54dbd 100644 --- a/src/plots.h +++ b/src/plots.h @@ -19,4 +19,3 @@ extern bool_ quest_ultra_evil_init_hook(int q_idx); /******* Plot Bree *********/ extern bool_ quest_thieves_init_hook(int q_idx); -extern bool_ quest_hobbit_init_hook(int q_idx); diff --git a/src/q_hobbit.c b/src/q_hobbit.c index b80638ad..fd15a94a 100644 --- a/src/q_hobbit.c +++ b/src/q_hobbit.c @@ -1,4 +1,6 @@ -#undef cquest +#include "q_hobbit.h" +#include "messages.h" + #define cquest (quest[QUEST_HOBBIT]) bool_ quest_hobbit_town_gen_hook(char *fmt) diff --git a/src/q_hobbit.h b/src/q_hobbit.h new file mode 100644 index 00000000..6295ae10 --- /dev/null +++ b/src/q_hobbit.h @@ -0,0 +1,13 @@ +#pragma once + +#include "angband.h" + +#ifdef __cplusplus +extern "C" { +#endif + +bool_ quest_hobbit_init_hook(int q_idx); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/src/tables.c b/src/tables.c index 6c721685..be79733f 100644 --- a/src/tables.c +++ b/src/tables.c @@ -31,6 +31,7 @@ #include "q_nazgul.h" #include "q_wight.h" #include "q_troll.h" +#include "q_hobbit.h" |