diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2014-12-18 23:38:42 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2014-12-23 12:07:54 +0100 |
| commit | 471e7819c6af3b3513770d0784aed22cb5597da7 (patch) | |
| tree | e7039d937dda25d49af0fa5f4fad69abb737c80e /src/q_invas.cc | |
| parent | c6673027ae73ff19195d5d69020eb6390ec6fd84 (diff) | |
Update HOOK_STAIR to new-style hook
Diffstat (limited to 'src/q_invas.cc')
| -rw-r--r-- | src/q_invas.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/q_invas.cc b/src/q_invas.cc index 489ecbad..42a83f8b 100644 --- a/src/q_invas.cc +++ b/src/q_invas.cc @@ -148,17 +148,15 @@ static bool_ quest_invasion_death_hook(const char *fmt) return FALSE; } -static bool_ quest_invasion_stair_hook(const char *fmt) +static bool_ quest_invasion_stair_hook(void *, void *in_, void *) { - cptr down; - - down = get_next_arg_str(fmt); + struct hook_stair_in *in = static_cast<struct hook_stair_in *>(in_); if (p_ptr->inside_quest != QUEST_INVASION) return FALSE; if (cave[p_ptr->py][p_ptr->px].feat != FEAT_LESS) return TRUE; - if (!strcmp(down, "up")) + if (in->direction == STAIRS_UP) { if (cquest.status == QUEST_STATUS_FAILED) { @@ -184,7 +182,7 @@ static bool_ quest_invasion_stair_hook(const char *fmt) cquest.status = QUEST_STATUS_FAILED; town_info[2].destroyed = TRUE; } - del_hook(HOOK_STAIR, quest_invasion_stair_hook); + del_hook_new(HOOK_STAIR, quest_invasion_stair_hook); process_hooks_restart = TRUE; return (FALSE); } @@ -198,10 +196,10 @@ bool_ quest_invasion_init_hook(int q_idx) add_hook_new(HOOK_CHAR_DUMP, quest_invasion_dump_hook, "invasion_dump", NULL); if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook(HOOK_MONSTER_AI, quest_invasion_ai_hook, "invasion_ai"); - add_hook(HOOK_GEN_QUEST, quest_invasion_gen_hook, "invasion_gen"); - add_hook(HOOK_MONSTER_DEATH, quest_invasion_death_hook, "invasion_death"); - add_hook(HOOK_STAIR, quest_invasion_stair_hook, "invasion_stair"); + add_hook (HOOK_MONSTER_AI, quest_invasion_ai_hook, "invasion_ai"); + add_hook (HOOK_GEN_QUEST, quest_invasion_gen_hook, "invasion_gen"); + add_hook (HOOK_MONSTER_DEATH, quest_invasion_death_hook, "invasion_death"); + add_hook_new(HOOK_STAIR, quest_invasion_stair_hook, "invasion_stair", NULL); } return (FALSE); } |