diff options
author | Bardur Arantsson <bardur@scientician.net> | 2013-03-24 18:33:52 +0100 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2013-09-27 14:46:40 +0200 |
commit | 1462a5fbe4ec3e4c87e489c283c6c4cbc0d5316b (patch) | |
tree | a67e51c5ef57bd48a337786b7a6d38c01f8b1b66 /src | |
parent | ddd8786965ed3e020d83ec940584c6c529ab9875 (diff) |
Split "Between cities" quest from plots.c
Diffstat (limited to 'src')
-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_betwen.c | 3 | ||||
-rw-r--r-- | src/q_betwen.h | 13 | ||||
-rw-r--r-- | src/tables.c | 1 |
6 files changed, 17 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b930392..255531bb 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_narsil.c q_evil.c q_betwen.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 c8f007b2..79b49eed 100644 --- a/src/plots.c +++ b/src/plots.c @@ -390,4 +390,3 @@ bool_ quest_null_hook(int q) /************************* Minas Anor plot ************************/ #include "q_haunted.c" -#include "q_betwen.c" diff --git a/src/plots.h b/src/plots.h index f4e6fac3..4ea20472 100644 --- a/src/plots.h +++ b/src/plots.h @@ -38,7 +38,6 @@ extern bool_ quest_invasion_init_hook(int q_idx); /******* Plot Minas Anor *********/ extern bool_ quest_haunted_init_hook(int q_idx); -extern bool_ quest_between_init_hook(int q_idx); /******* Plot God Quest **************/ extern bool_ quest_god_describe(FILE *); diff --git a/src/q_betwen.c b/src/q_betwen.c index e6452dd9..1814cf2b 100644 --- a/src/q_betwen.c +++ b/src/q_betwen.c @@ -1,4 +1,5 @@ -#undef cquest +#include "q_betwen.h" + #define cquest (quest[QUEST_BETWEEN]) bool_ quest_between_move_hook(char *fmt) diff --git a/src/q_betwen.h b/src/q_betwen.h new file mode 100644 index 00000000..80ce5e42 --- /dev/null +++ b/src/q_betwen.h @@ -0,0 +1,13 @@ +#pragma once + +#include "angband.h" + +#ifdef __cplusplus +extern "C" { +#endif + +bool_ quest_between_init_hook(int q_idx); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/src/tables.c b/src/tables.c index cfb2c867..67a35ffd 100644 --- a/src/tables.c +++ b/src/tables.c @@ -17,6 +17,7 @@ #include "q_thrain.h" #include "q_narsil.h" #include "q_evil.h" +#include "q_betwen.h" |