summaryrefslogtreecommitdiff
path: root/src/q_nirna.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2014-12-18 23:38:42 +0100
committerBardur Arantsson <bardur@scientician.net>2014-12-23 12:07:54 +0100
commit471e7819c6af3b3513770d0784aed22cb5597da7 (patch)
treee7039d937dda25d49af0fa5f4fad69abb737c80e /src/q_nirna.cc
parentc6673027ae73ff19195d5d69020eb6390ec6fd84 (diff)
Update HOOK_STAIR to new-style hook
Diffstat (limited to 'src/q_nirna.cc')
-rw-r--r--src/q_nirna.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/q_nirna.cc b/src/q_nirna.cc
index d19491db..a0774cb5 100644
--- a/src/q_nirna.cc
+++ b/src/q_nirna.cc
@@ -89,7 +89,7 @@ static bool_ quest_nirnaeth_death_hook(const char *fmt)
return FALSE;
}
-static bool_ quest_nirnaeth_stair_hook(const char *fmt)
+static bool_ quest_nirnaeth_stair_hook(void *, void *, void *)
{
if (p_ptr->inside_quest != QUEST_NIRNAETH) return FALSE;
@@ -97,7 +97,8 @@ static bool_ quest_nirnaeth_stair_hook(const char *fmt)
cmsg_print(TERM_YELLOW, "You found a way out!");
cquest.status = QUEST_STATUS_COMPLETED;
- del_hook(HOOK_STAIR, quest_nirnaeth_stair_hook);
+
+ del_hook_new(HOOK_STAIR, quest_nirnaeth_stair_hook);
process_hooks_restart = TRUE;
return (FALSE);
}
@@ -106,10 +107,10 @@ bool_ quest_nirnaeth_init_hook(int q_idx)
{
if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
{
- add_hook(HOOK_MONSTER_DEATH, quest_nirnaeth_death_hook, "nirnaeth_death");
- add_hook(HOOK_GEN_QUEST, quest_nirnaeth_gen_hook, "nirnaeth_gen");
- add_hook(HOOK_STAIR, quest_nirnaeth_stair_hook, "nirnaeth_stair");
- add_hook(HOOK_QUEST_FINISH, quest_nirnaeth_finish_hook, "nirnaeth_finish");
+ add_hook (HOOK_MONSTER_DEATH, quest_nirnaeth_death_hook, "nirnaeth_death");
+ add_hook (HOOK_GEN_QUEST, quest_nirnaeth_gen_hook, "nirnaeth_gen");
+ add_hook_new(HOOK_STAIR, quest_nirnaeth_stair_hook, "nirnaeth_stair", NULL);
+ add_hook (HOOK_QUEST_FINISH, quest_nirnaeth_finish_hook, "nirnaeth_finish");
}
return (FALSE);
}