diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2014-12-18 22:52:04 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2014-12-23 12:07:54 +0100 |
| commit | f7840bdcc6490388bc8d99afab2ab36ba85cfe45 (patch) | |
| tree | 7f8eb7933334cb52d97c44cd58c792b1c312ace5 /src/q_main.cc | |
| parent | dd1e7a5ac938eb75ccbf20ea84954d63511f4611 (diff) | |
Update HOOK_NEW_MONSTER to new-style hook
Diffstat (limited to 'src/q_main.cc')
| -rw-r--r-- | src/q_main.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/q_main.cc b/src/q_main.cc index 17651da2..0efd41c9 100644 --- a/src/q_main.cc +++ b/src/q_main.cc @@ -11,10 +11,10 @@ static void quest_describe(int q_idx) } } -static bool_ quest_main_monsters_hook(const char *fmt) +static bool_ quest_main_monsters_hook(void *, void *in_, void *) { - s32b r_idx; - r_idx = get_next_arg(fmt); + struct hook_new_monster_in *in = static_cast<struct hook_new_monster_in *>(in_); + s32b r_idx = in->r_idx; /* Sauron */ if (r_idx == 860) @@ -103,8 +103,8 @@ bool_ quest_morgoth_init_hook(int q_idx) { add_hook(HOOK_MONSTER_DEATH, quest_morgoth_hook, "morgort_death"); } - add_hook_new(HOOK_CHAR_DUMP, quest_morgoth_dump_hook, "morgoth_dump", NULL); - add_hook (HOOK_NEW_MONSTER, quest_main_monsters_hook, "main_new_monster"); + add_hook_new(HOOK_CHAR_DUMP, quest_morgoth_dump_hook, "morgoth_dump", NULL); + add_hook_new(HOOK_NEW_MONSTER, quest_main_monsters_hook, "main_new_monster", NULL); return (FALSE); } @@ -157,8 +157,8 @@ bool_ quest_sauron_init_hook(int q_idx) { add_hook(HOOK_MONSTER_DEATH, quest_sauron_hook, "sauron_death"); } - add_hook(HOOK_NEW_MONSTER, quest_main_monsters_hook, "main_new_monster"); - add_hook(HOOK_MONSTER_DEATH, quest_sauron_resurect_hook, "sauron_resurect_death"); + add_hook_new(HOOK_NEW_MONSTER, quest_main_monsters_hook, "main_new_monster", NULL); + add_hook (HOOK_MONSTER_DEATH, quest_sauron_resurect_hook, "sauron_resurect_death"); return (FALSE); } @@ -191,6 +191,6 @@ bool_ quest_necro_init_hook(int q_idx) { add_hook(HOOK_MONSTER_DEATH, quest_necro_hook, "necro_death"); } - add_hook(HOOK_NEW_MONSTER, quest_main_monsters_hook, "main_new_monster"); + add_hook_new(HOOK_NEW_MONSTER, quest_main_monsters_hook, "main_new_monster", NULL); return (FALSE); } |