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_troll.cc | |
| parent | 2ae865768c1e0d575993f135f9b4fad3eeedc0b0 (diff) | |
Update HOOK_QUEST_FINISH to new-style hook
Diffstat (limited to 'src/q_troll.cc')
| -rw-r--r-- | src/q_troll.cc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/q_troll.cc b/src/q_troll.cc index 474a1cd1..bb5f8729 100644 --- a/src/q_troll.cc +++ b/src/q_troll.cc @@ -96,11 +96,10 @@ static bool_ quest_troll_gen_hook(void *, void *, void *) return TRUE; } -static bool_ quest_troll_finish_hook(const char *fmt) +static bool_ quest_troll_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_TROLL) return FALSE; @@ -111,7 +110,7 @@ static bool_ quest_troll_finish_hook(const char *fmt) *(quest[q_idx].plot) = QUEST_NAZGUL; quest[*(quest[q_idx].plot)].init(*(quest[q_idx].plot)); - del_hook(HOOK_QUEST_FINISH, quest_troll_finish_hook); + del_hook_new(HOOK_QUEST_FINISH, quest_troll_finish_hook); process_hooks_restart = TRUE; return TRUE; @@ -172,9 +171,9 @@ bool_ quest_troll_init_hook(int q_idx) { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook_new(HOOK_MONSTER_DEATH, quest_troll_death_hook, "troll_death", NULL); - add_hook_new(HOOK_GEN_QUEST, quest_troll_gen_hook, "troll_gen", NULL); - add_hook (HOOK_QUEST_FINISH, quest_troll_finish_hook, "troll_finish"); + add_hook_new(HOOK_MONSTER_DEATH, quest_troll_death_hook, "troll_death", NULL); + add_hook_new(HOOK_GEN_QUEST, quest_troll_gen_hook, "troll_gen", NULL); + add_hook_new(HOOK_QUEST_FINISH, quest_troll_finish_hook, "troll_finish", NULL); } return (FALSE); } |