diff options
author | Bardur Arantsson <bardur@scientician.net> | 2013-03-24 19:22:40 +0100 |
---|---|---|
committer | Bardur Arantsson <bardur@scientician.net> | 2013-09-27 14:46:41 +0200 |
commit | a7abd11f574fc89620ddafa9ebac4f7fa50a1a7a (patch) | |
tree | 389b1b6331779d0b778e448ae8dd0c773cdecee8 /src | |
parent | 82224d3c88d07a02ec1db676d3bbb7d4b07bea0f (diff) |
Split "Ultra Evil" quest from plots.c
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/plots.c | 2 | ||||
-rw-r--r-- | src/plots.h | 1 | ||||
-rw-r--r-- | src/q_ultrae.c | 5 | ||||
-rw-r--r-- | src/q_ultrae.h | 13 | ||||
-rw-r--r-- | src/tables.c | 1 |
6 files changed, 17 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f9fc4a34..3aea4af5 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_troll.c q_hobbit.c q_thief.c q_ultrae.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 d3cc6827..ed4c65ea 100644 --- a/src/plots.c +++ b/src/plots.c @@ -367,4 +367,4 @@ bool_ quest_null_hook(int q) #include "q_main.c" #include "q_one.c" #include "q_ultrag.c" -#include "q_ultrae.c" + diff --git a/src/plots.h b/src/plots.h index d5cc364d..56253e6d 100644 --- a/src/plots.h +++ b/src/plots.h @@ -15,4 +15,3 @@ 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); -extern bool_ quest_ultra_evil_init_hook(int q_idx); diff --git a/src/q_ultrae.c b/src/q_ultrae.c index 78471df5..44f54158 100644 --- a/src/q_ultrae.c +++ b/src/q_ultrae.c @@ -1,8 +1,5 @@ -/* - * Here takes place the Evil ultra ending - */ +#include "q_ultrae.h" -#undef cquest #define cquest (quest[QUEST_ULTRA_EVIL]) bool_ quest_ultra_evil_init_hook(int q) diff --git a/src/q_ultrae.h b/src/q_ultrae.h new file mode 100644 index 00000000..3f97fcb3 --- /dev/null +++ b/src/q_ultrae.h @@ -0,0 +1,13 @@ +#pragma once + +#include "angband.h" + +#ifdef __cplusplus +extern "C" { +#endif + +bool_ quest_ultra_evil_init_hook(int q_idx); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/src/tables.c b/src/tables.c index 2d4a0275..52fb4db6 100644 --- a/src/tables.c +++ b/src/tables.c @@ -33,6 +33,7 @@ #include "q_troll.h" #include "q_hobbit.h" #include "q_thief.h" +#include "q_ultrae.h" |