diff options
author | Manoj Srivastava <srivasta@debian.org> | 2020-05-23 00:33:19 -0700 |
---|---|---|
committer | Manoj Srivastava <srivasta@debian.org> | 2020-05-23 00:33:19 -0700 |
commit | d6b913d3ca2e84b75f3675fd6e9f5246c100cf27 (patch) | |
tree | 5fc28b7efc737bf2c79dc7d799e0a6013957fe11 /src/q_wolves.cc | |
parent | c42f029316c0c004a795ca170bdb50644a800534 (diff) | |
parent | 73a0259be1d44fdb2ab34266ae0ff63f0d8f0b60 (diff) |
Merge branch 'master' into dgit/siddebian/2.4.0-ah-1archive/debian/2.4.0-ah-1
Diffstat (limited to 'src/q_wolves.cc')
-rw-r--r-- | src/q_wolves.cc | 55 |
1 files changed, 34 insertions, 21 deletions
diff --git a/src/q_wolves.cc b/src/q_wolves.cc index c5863b59..0e811ce6 100644 --- a/src/q_wolves.cc +++ b/src/q_wolves.cc @@ -2,7 +2,10 @@ #include "cave.hpp" #include "cave_type.hpp" +#include "dungeon_flag.hpp" +#include "feature_flag.hpp" #include "feature_type.hpp" +#include "game.hpp" #include "hook_quest_finish_in.hpp" #include "hooks.hpp" #include "init1.hpp" @@ -17,17 +20,24 @@ #define cquest (quest[QUEST_WOLVES]) -static bool_ quest_wolves_gen_hook(void *, void *, void *) +static bool quest_wolves_gen_hook(void *, void *, void *) { + auto const &f_info = game->edit_data.f_info; + int x, y, i; int xstart = 2; int ystart = 2; - if (p_ptr->inside_quest != QUEST_WOLVES) return FALSE; + if (p_ptr->inside_quest != QUEST_WOLVES) + { + return false; + } /* Just in case we didnt talk the the mayor */ if (cquest.status == QUEST_STATUS_UNTAKEN) + { cquest.status = QUEST_STATUS_TAKEN; + } /* Start with perm walls */ for (y = 0; y < cur_hgt; y++) @@ -48,18 +58,17 @@ static bool_ quest_wolves_gen_hook(void *, void *, void *) init_flags = INIT_CREATE_DUNGEON; process_dungeon_file("wolves.map", &ystart, &xstart, cur_hgt, cur_wid, TRUE, FALSE); - dungeon_flags2 |= DF2_NO_GENO; + dungeon_flags |= DF_NO_GENO; /* Place some random wolves */ for (i = damroll(4, 4); i > 0; ) { - int m_idx, flags; y = rand_int(21) + 3; x = rand_int(31) + 3; - flags = f_info[cave[y][x].feat].flags1; - if (!(flags & FF1_PERMANENT) && (flags & FF1_FLOOR)) + auto const flags = f_info[cave[y][x].feat].flags; + if (!(flags & FF_PERMANENT) && (flags & FF_FLOOR)) { - m_idx = place_monster_one(y, x, 196, 0, magik(50), MSTATUS_ENEMY); + int m_idx = place_monster_one(y, x, 196, 0, magik(50), MSTATUS_ENEMY); if (m_idx) m_list[m_idx].mflag |= MFLAG_QUEST; --i; } @@ -68,13 +77,12 @@ static bool_ quest_wolves_gen_hook(void *, void *, void *) /* Place some random wargs */ for (i = damroll(4, 4); i > 0; ) { - int m_idx, flags; y = rand_int(21) + 3; x = rand_int(31) + 3; - flags = f_info[cave[y][x].feat].flags1; - if (!(flags & FF1_PERMANENT) && (flags & FF1_FLOOR)) + auto const flags = f_info[cave[y][x].feat].flags; + if (!(flags & FF_PERMANENT) && (flags & FF_FLOOR)) { - m_idx = place_monster_one(y, x, 257, 0, magik(50), MSTATUS_ENEMY); + int m_idx = place_monster_one(y, x, 257, 0, magik(50), MSTATUS_ENEMY); if (m_idx) m_list[m_idx].mflag |= MFLAG_QUEST; --i; } @@ -82,14 +90,17 @@ static bool_ quest_wolves_gen_hook(void *, void *, void *) process_hooks_restart = TRUE; - return TRUE; + return true; } -static bool_ quest_wolves_death_hook(void *, void *, void *) +static bool quest_wolves_death_hook(void *, void *, void *) { int i, mcnt = 0; - if (p_ptr->inside_quest != QUEST_WOLVES) return FALSE; + if (p_ptr->inside_quest != QUEST_WOLVES) + { + return false; + } /* Process the monsters (backwards) */ for (i = m_max - 1; i >= 1; i--) @@ -113,17 +124,20 @@ static bool_ quest_wolves_death_hook(void *, void *, void *) process_hooks_restart = TRUE; cmsg_print(TERM_YELLOW, "Lothlorien is safer now."); - return (FALSE); + return false; } - return FALSE; + return false; } -static bool_ quest_wolves_finish_hook(void *, void *in_, void *) +static bool quest_wolves_finish_hook(void *, void *in_, void *) { struct hook_quest_finish_in *in = static_cast<struct hook_quest_finish_in *>(in_); s32b q_idx = in->q_idx; - if (q_idx != QUEST_WOLVES) return FALSE; + if (q_idx != QUEST_WOLVES) + { + return false; + } c_put_str(TERM_YELLOW, "Thank you for killing the pack of wolves!", 8, 0); c_put_str(TERM_YELLOW, "You can use the hut as your house as a reward.", 9, 0); @@ -131,10 +145,10 @@ static bool_ quest_wolves_finish_hook(void *, void *in_, void *) /* Continue the plot */ *(quest[q_idx].plot) = QUEST_SPIDER; - return TRUE; + return true; } -bool_ quest_wolves_init_hook(int q_idx) +void quest_wolves_init_hook() { if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { @@ -142,5 +156,4 @@ bool_ quest_wolves_init_hook(int q_idx) add_hook_new(HOOK_QUEST_FINISH, quest_wolves_finish_hook, "wolves_finish", NULL); add_hook_new(HOOK_GEN_QUEST, quest_wolves_gen_hook, "wolves_geb", NULL); } - return (FALSE); } |