diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2014-12-21 15:27:44 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2014-12-23 12:07:55 +0100 |
| commit | cbc0dcecffb9cf29708b1c1c4e60df49a1994add (patch) | |
| tree | 9d348ed90d4cad5e5174c7b3f094445a849d5f69 /src/q_nirna.cc | |
| parent | 2ae865768c1e0d575993f135f9b4fad3eeedc0b0 (diff) | |
Update HOOK_QUEST_FINISH to new-style hook
Diffstat (limited to 'src/q_nirna.cc')
| -rw-r--r-- | src/q_nirna.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/q_nirna.cc b/src/q_nirna.cc index 9306ed31..145c9953 100644 --- a/src/q_nirna.cc +++ b/src/q_nirna.cc @@ -42,11 +42,10 @@ static bool_ quest_nirnaeth_gen_hook(void *, void *, void *) return TRUE; } -static bool_ quest_nirnaeth_finish_hook(const char *fmt) +static bool_ quest_nirnaeth_finish_hook(void *, void *in_, void *) { - s32b q_idx; - - q_idx = get_next_arg(fmt); + struct hook_quest_finish_in *in = static_cast<struct hook_quest_finish_in *>(in_); + s32b q_idx = in->q_idx; if (q_idx != QUEST_NIRNAETH) return FALSE; @@ -74,7 +73,7 @@ static bool_ quest_nirnaeth_finish_hook(const char *fmt) /* Continue the plot */ *(quest[q_idx].plot) = QUEST_NULL; - del_hook(HOOK_QUEST_FINISH, quest_nirnaeth_finish_hook); + del_hook_new(HOOK_QUEST_FINISH, quest_nirnaeth_finish_hook); process_hooks_restart = TRUE; return TRUE; @@ -107,10 +106,10 @@ bool_ quest_nirnaeth_init_hook(int q_idx) { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook_new(HOOK_MONSTER_DEATH, quest_nirnaeth_death_hook, "nirnaeth_death", NULL); - add_hook_new(HOOK_GEN_QUEST, quest_nirnaeth_gen_hook, "nirnaeth_gen", NULL); - add_hook_new(HOOK_STAIR, quest_nirnaeth_stair_hook, "nirnaeth_stair", NULL); - add_hook (HOOK_QUEST_FINISH, quest_nirnaeth_finish_hook, "nirnaeth_finish"); + add_hook_new(HOOK_MONSTER_DEATH, quest_nirnaeth_death_hook, "nirnaeth_death", NULL); + add_hook_new(HOOK_GEN_QUEST, quest_nirnaeth_gen_hook, "nirnaeth_gen", NULL); + add_hook_new(HOOK_STAIR, quest_nirnaeth_stair_hook, "nirnaeth_stair", NULL); + add_hook_new(HOOK_QUEST_FINISH, quest_nirnaeth_finish_hook, "nirnaeth_finish", NULL); } return (FALSE); } |