diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2014-12-18 19:22:12 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2014-12-23 12:07:54 +0100 |
| commit | dd5f6f4691b9975c7087a9bb6f92befd59e5d795 (patch) | |
| tree | 7c271361e39fa556fbadf68f53f46e904e5d478a /src/q_shroom.cc | |
| parent | c315b41d8fd2ee37a36eaaafec10994623392df3 (diff) | |
Update HOOK_GIVE to new-style hook
Diffstat (limited to 'src/q_shroom.cc')
| -rw-r--r-- | src/q_shroom.cc | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/q_shroom.cc b/src/q_shroom.cc index d402c818..e9a5d83c 100644 --- a/src/q_shroom.cc +++ b/src/q_shroom.cc @@ -104,14 +104,14 @@ static bool_ quest_shroom_death_hook(const char *fmt) return FALSE; } -static bool_ quest_shroom_give_hook(const char *fmt) +static bool_ quest_shroom_give_hook(void *, void *in_, void *) { + struct hook_give_in *in = static_cast<struct hook_give_in *>(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]; @@ -128,9 +128,9 @@ static bool_ quest_shroom_give_hook(const char *fmt) msg_print("YOU MURDERER! Out of my sight!"); delete_monster_idx(m_idx); - del_hook(HOOK_GIVE, quest_shroom_give_hook); - del_hook(HOOK_CHAT, quest_shroom_speak_hook); - del_hook(HOOK_WILD_GEN, quest_shroom_town_gen_hook); + del_hook_new(HOOK_GIVE, quest_shroom_give_hook); + del_hook (HOOK_CHAT, quest_shroom_speak_hook); + del_hook (HOOK_WILD_GEN, quest_shroom_town_gen_hook); process_hooks_restart = TRUE; return TRUE; } @@ -180,7 +180,7 @@ static bool_ quest_shroom_give_hook(const char *fmt) cquest.status = QUEST_STATUS_FINISHED; - del_hook(HOOK_GIVE, quest_shroom_give_hook); + del_hook_new(HOOK_GIVE, quest_shroom_give_hook); process_hooks_restart = TRUE; } else @@ -216,9 +216,9 @@ static bool_ quest_shroom_speak_hook(const char *fmt) msg_print("YOU MURDERER! Out of my sight!"); delete_monster_idx(m_idx); - del_hook(HOOK_GIVE, quest_shroom_give_hook); - del_hook(HOOK_CHAT, quest_shroom_speak_hook); - del_hook(HOOK_WILD_GEN, quest_shroom_town_gen_hook); + del_hook_new(HOOK_GIVE, quest_shroom_give_hook); + del_hook (HOOK_CHAT, quest_shroom_speak_hook); + del_hook (HOOK_WILD_GEN, quest_shroom_town_gen_hook); process_hooks_restart = TRUE; return TRUE; } @@ -261,9 +261,9 @@ static bool_ quest_shroom_chat_hook(const char *fmt) msg_print("YOU MURDERER! Out of my sight!"); delete_monster_idx(m_idx); - del_hook(HOOK_GIVE, quest_shroom_give_hook); - del_hook(HOOK_CHAT, quest_shroom_speak_hook); - del_hook(HOOK_WILD_GEN, quest_shroom_town_gen_hook); + del_hook_new(HOOK_GIVE, quest_shroom_give_hook); + del_hook (HOOK_CHAT, quest_shroom_speak_hook); + del_hook (HOOK_WILD_GEN, quest_shroom_town_gen_hook); process_hooks_restart = TRUE; return TRUE; } @@ -288,11 +288,11 @@ bool_ quest_shroom_init_hook(int q_idx) if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook(HOOK_MONSTER_DEATH, quest_shroom_death_hook, "shroom_death"); - add_hook(HOOK_GIVE, quest_shroom_give_hook, "shroom_give"); - add_hook(HOOK_WILD_GEN, quest_shroom_town_gen_hook, "shroom_town_gen"); - add_hook(HOOK_CHAT, quest_shroom_chat_hook, "shroom_chat"); - add_hook(HOOK_MON_SPEAK, quest_shroom_speak_hook, "shroom_speak"); + add_hook (HOOK_MONSTER_DEATH, quest_shroom_death_hook, "shroom_death"); + add_hook_new(HOOK_GIVE, quest_shroom_give_hook, "shroom_give", NULL); + add_hook (HOOK_WILD_GEN, quest_shroom_town_gen_hook, "shroom_town_gen"); + add_hook (HOOK_CHAT, quest_shroom_chat_hook, "shroom_chat"); + add_hook (HOOK_MON_SPEAK, quest_shroom_speak_hook, "shroom_speak"); } if (cquest.status == QUEST_STATUS_UNTAKEN) { |