diff options
| -rw-r--r-- | src/q_god.cc | 17 | ||||
| -rw-r--r-- | src/xtra2.cc | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/q_god.cc b/src/q_god.cc index c1a41ccf..7ce8b8f7 100644 --- a/src/q_god.cc +++ b/src/q_god.cc @@ -922,9 +922,10 @@ static bool_ quest_god_level_end_gen_hook(void *, void *, void *) return FALSE; } -static bool_ quest_god_player_level_hook(const char *fmt) +static bool_ quest_god_player_level_hook(void *, void *in_, void *) { - s32b gained = get_next_arg(fmt); + struct hook_player_level_in *in = static_cast<struct hook_player_level_in *>(in_); + s32b gained = in->gained_levels; if (gained <= 0) { @@ -1177,13 +1178,13 @@ bool_ quest_god_init_hook(int q) if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook_new(HOOK_LEVEL_END_GEN, quest_god_level_end_gen_hook, "q_god_level_end_gen", NULL); - add_hook_new(HOOK_ENTER_DUNGEON, quest_god_enter_dungeon_hook, "q_god_enter_dungeon", NULL); + add_hook_new(HOOK_LEVEL_END_GEN, quest_god_level_end_gen_hook, "q_god_level_end_gen", NULL); + add_hook_new(HOOK_ENTER_DUNGEON, quest_god_enter_dungeon_hook, "q_god_enter_dungeon", NULL); add_hook_new(HOOK_GEN_LEVEL_BEGIN, quest_god_gen_level_begin_hook, "q_god_gen_level_begin", NULL); - add_hook_new(HOOK_STAIR, quest_god_stair_hook, "q_god_hook_stair", NULL); - add_hook_new(HOOK_GET, quest_god_get_hook, "q_god_get", NULL); - add_hook_new(HOOK_CHAR_DUMP, quest_god_char_dump_hook, "q_god_char_dump", NULL); - add_hook (HOOK_PLAYER_LEVEL, quest_god_player_level_hook, "q_god_player_level"); + add_hook_new(HOOK_STAIR, quest_god_stair_hook, "q_god_hook_stair", NULL); + add_hook_new(HOOK_GET, quest_god_get_hook, "q_god_get", NULL); + add_hook_new(HOOK_CHAR_DUMP, quest_god_char_dump_hook, "q_god_char_dump", NULL); + add_hook_new(HOOK_PLAYER_LEVEL, quest_god_player_level_hook, "q_god_player_level", NULL); } /* Need this to re-initialize at birth; the quest data is diff --git a/src/xtra2.cc b/src/xtra2.cc index 46c04453..ef1ccf64 100644 --- a/src/xtra2.cc +++ b/src/xtra2.cc @@ -2124,8 +2124,6 @@ void check_experience(void) } /* Hook it! */ - process_hooks(HOOK_PLAYER_LEVEL, "(d)", gained); - { hook_player_level_in in = { gained }; process_hooks_new(HOOK_PLAYER_LEVEL, &in, NULL); |