From dd5f6f4691b9975c7087a9bb6f92befd59e5d795 Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Thu, 18 Dec 2014 19:22:12 +0100 Subject: Update HOOK_GIVE to new-style hook --- src/q_hobbit.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) (limited to 'src/q_hobbit.cc') diff --git a/src/q_hobbit.cc b/src/q_hobbit.cc index a6a1f140..8e787777 100644 --- a/src/q_hobbit.cc +++ b/src/q_hobbit.cc @@ -65,14 +65,13 @@ static bool_ quest_hobbit_gen_hook(const char *fmt) return FALSE; } -static bool_ quest_hobbit_give_hook(const char *fmt) +static bool_ quest_hobbit_give_hook(void *, void *in_, void *) { + struct hook_give_in *in = static_cast(in_); object_type *o_ptr; monster_type *m_ptr; - s32b m_idx, item; - - m_idx = get_next_arg(fmt); - item = get_next_arg(fmt); + s32b m_idx = in->m_idx; + s32b item = in->item; o_ptr = &p_ptr->inventory[item]; m_ptr = &m_list[m_idx]; @@ -90,7 +89,7 @@ static bool_ quest_hobbit_give_hook(const char *fmt) cquest.status = QUEST_STATUS_COMPLETED; - del_hook(HOOK_GIVE, quest_hobbit_give_hook); + del_hook_new(HOOK_GIVE, quest_hobbit_give_hook); process_hooks_restart = TRUE; return TRUE; @@ -190,11 +189,11 @@ bool_ quest_hobbit_init_hook(int q_idx) if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook(HOOK_GIVE, quest_hobbit_give_hook, "hobbit_give"); - add_hook(HOOK_GEN_LEVEL, quest_hobbit_gen_hook, "hobbit_gen"); - add_hook(HOOK_WILD_GEN, quest_hobbit_town_gen_hook, "hobbit_town_gen"); - add_hook(HOOK_CHAT, quest_hobbit_chat_hook, "hobbit_chat"); - add_hook(HOOK_MON_SPEAK, quest_hobbit_speak_hook, "hobbit_speak"); + add_hook_new(HOOK_GIVE, quest_hobbit_give_hook, "hobbit_give", NULL); + add_hook (HOOK_GEN_LEVEL, quest_hobbit_gen_hook, "hobbit_gen"); + add_hook (HOOK_WILD_GEN, quest_hobbit_town_gen_hook, "hobbit_town_gen"); + add_hook (HOOK_CHAT, quest_hobbit_chat_hook, "hobbit_chat"); + add_hook (HOOK_MON_SPEAK, quest_hobbit_speak_hook, "hobbit_speak"); } if (cquest.status == QUEST_STATUS_UNTAKEN) { -- cgit v1.2.3