diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2014-12-18 21:56:53 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2014-12-23 12:07:54 +0100 |
| commit | 132e99238140b1628a2f0175a6edc85358fe8101 (patch) | |
| tree | 5d9634281e95d71a28451c78a50b59cec702b003 /src/q_hobbit.cc | |
| parent | e190564a0791cef0ac7a8393d23643af7d1be3cb (diff) | |
Update HOOK_WILD_GEN to new-style hook
Diffstat (limited to 'src/q_hobbit.cc')
| -rw-r--r-- | src/q_hobbit.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/q_hobbit.cc b/src/q_hobbit.cc index c479eb84..143e7599 100644 --- a/src/q_hobbit.cc +++ b/src/q_hobbit.cc @@ -4,12 +4,11 @@ #define cquest (quest[QUEST_HOBBIT]) -static bool_ quest_hobbit_town_gen_hook(const char *fmt) +static bool_ quest_hobbit_town_gen_hook(void *, void *in_, void *) { + struct hook_wild_gen_in *in = static_cast<struct hook_wild_gen_in *>(in_); int x = 1, y = 1, tries = 10000; - s32b small; - - small = get_next_arg(fmt); + bool_ small = in->small; if ((turn < (cquest.data[1] + (DAY * 10L))) || (cquest.status > QUEST_STATUS_COMPLETED) || (small) || (p_ptr->town_num != 1)) return (FALSE); @@ -185,17 +184,17 @@ bool_ quest_hobbit_init_hook(int q_idx) if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook_new(HOOK_GIVE, quest_hobbit_give_hook, "hobbit_give", NULL); - add_hook_new(HOOK_GEN_LEVEL, quest_hobbit_gen_hook, "hobbit_gen", NULL); - add_hook (HOOK_WILD_GEN, quest_hobbit_town_gen_hook, "hobbit_town_gen"); - add_hook_new(HOOK_CHAT, quest_hobbit_chat_hook, "hobbit_chat", NULL); - add_hook_new(HOOK_MON_SPEAK, quest_hobbit_speak_hook, "hobbit_speak", NULL); + add_hook_new(HOOK_GIVE, quest_hobbit_give_hook, "hobbit_give", NULL); + add_hook_new(HOOK_GEN_LEVEL, quest_hobbit_gen_hook, "hobbit_gen", NULL); + add_hook_new(HOOK_WILD_GEN, quest_hobbit_town_gen_hook, "hobbit_town_gen", NULL); + add_hook_new(HOOK_CHAT, quest_hobbit_chat_hook, "hobbit_chat", NULL); + add_hook_new(HOOK_MON_SPEAK, quest_hobbit_speak_hook, "hobbit_speak", NULL); } if (cquest.status == QUEST_STATUS_UNTAKEN) { - add_hook_new(HOOK_MON_SPEAK, quest_hobbit_speak_hook, "hobbit_speak", NULL); - add_hook (HOOK_WILD_GEN, quest_hobbit_town_gen_hook, "hobbit_town_gen"); - add_hook_new(HOOK_CHAT, quest_hobbit_chat_hook, "hobbit_chat", NULL); + add_hook_new(HOOK_MON_SPEAK, quest_hobbit_speak_hook, "hobbit_speak", NULL); + add_hook_new(HOOK_WILD_GEN, quest_hobbit_town_gen_hook, "hobbit_town_gen", NULL); + add_hook_new(HOOK_CHAT, quest_hobbit_chat_hook, "hobbit_chat", NULL); } add_hook(HOOK_CHAR_DUMP, quest_hobbit_dump_hook, "hobbit_dump"); return (FALSE); |