diff options
| -rw-r--r-- | src/generate.cc | 1 | ||||
| -rw-r--r-- | src/q_god.cc | 4 | ||||
| -rw-r--r-- | src/q_one.cc | 8 | ||||
| -rw-r--r-- | src/q_rand.cc | 14 |
4 files changed, 13 insertions, 14 deletions
diff --git a/src/generate.cc b/src/generate.cc index 55abf670..91b19eb2 100644 --- a/src/generate.cc +++ b/src/generate.cc @@ -8302,7 +8302,6 @@ static void finalise_special_level(void) /* No special levels on the surface */ if (!dun_level) return; - process_hooks(HOOK_LEVEL_END_GEN, "()"); process_hooks_new(HOOK_LEVEL_END_GEN, NULL, NULL); /* Calculate relative depth */ diff --git a/src/q_god.cc b/src/q_god.cc index a6fd9918..a0156006 100644 --- a/src/q_god.cc +++ b/src/q_god.cc @@ -865,7 +865,7 @@ static void quest_god_set_god_dungeon_attributes_mandos() d_info[DUNGEON_GOD].rules[0].mflags3 = RF3_UNDEAD | RF3_EVIL; } -static bool_ quest_god_level_end_gen_hook(const char *fmt) +static bool_ quest_god_level_end_gen_hook(void *, void *, void *) { /* Check for dungeon */ if ((dungeon_type != DUNGEON_GOD) || @@ -1177,7 +1177,7 @@ bool_ quest_god_init_hook(int q) if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook (HOOK_LEVEL_END_GEN, quest_god_level_end_gen_hook, "q_god_level_end_gen"); + add_hook_new(HOOK_LEVEL_END_GEN, quest_god_level_end_gen_hook, "q_god_level_end_gen", NULL); add_hook (HOOK_ENTER_DUNGEON, quest_god_enter_dungeon_hook, "q_god_enter_dungeon"); add_hook (HOOK_GEN_LEVEL_BEGIN, quest_god_gen_level_begin_hook, "q_god_gen_level_begin"); add_hook_new(HOOK_STAIR, quest_god_stair_hook, "q_god_hook_stair", NULL); diff --git a/src/q_one.cc b/src/q_one.cc index 3412de56..a1f37f76 100644 --- a/src/q_one.cc +++ b/src/q_one.cc @@ -303,7 +303,7 @@ static bool_ quest_one_dump_hook(void *, void *in_, void *) return (FALSE); } -static bool_ quest_one_gen_hook(const char *fmt) +static bool_ quest_one_gen_hook(void *, void *, void *) { s32b x, y, tries = 10000; @@ -338,11 +338,11 @@ bool_ quest_one_init_hook(int q_idx) { if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook (HOOK_LEVEL_END_GEN, quest_one_gen_hook, "one_gen"); + add_hook_new(HOOK_LEVEL_END_GEN, quest_one_gen_hook, "one_gen", NULL); add_hook_new(HOOK_MONSTER_DEATH, quest_one_death_hook, "one_death", NULL); - add_hook_new(HOOK_DROP, quest_one_drop_hook, "one_drop", NULL); + add_hook_new(HOOK_DROP, quest_one_drop_hook, "one_drop", NULL); add_hook_new(HOOK_WIELD, quest_one_wield_hook, "one_wield", NULL); - add_hook_new(HOOK_IDENTIFY, quest_one_identify_hook, "one_id", NULL); + add_hook_new(HOOK_IDENTIFY, quest_one_identify_hook, "one_id", NULL); } if (cquest.status == QUEST_STATUS_UNTAKEN) { diff --git a/src/q_rand.cc b/src/q_rand.cc index cb0fa42c..0fa89f30 100644 --- a/src/q_rand.cc +++ b/src/q_rand.cc @@ -425,7 +425,7 @@ static bool_ quest_random_feeling_hook(void *, void *, void *) return (FALSE); } -static bool_ quest_random_gen_hero_hook(const char *fmt) +static bool_ quest_random_gen_hero_hook(void *, void *, void *) { int i; @@ -616,12 +616,12 @@ bool_ quest_random_describe(FILE *fff) bool_ quest_random_init_hook(int q_idx) { - add_hook_new(HOOK_MONSTER_DEATH, quest_random_death_hook, "rand_death", NULL); - add_hook_new(HOOK_NEW_LEVEL, quest_random_turn_hook, "rand_new_lvl", NULL); + add_hook_new(HOOK_MONSTER_DEATH, quest_random_death_hook, "rand_death", NULL); + add_hook_new(HOOK_NEW_LEVEL, quest_random_turn_hook, "rand_new_lvl", NULL); add_hook_new(HOOK_LEVEL_REGEN, quest_random_turn_hook, "rand_regen_lvl", NULL); - add_hook (HOOK_LEVEL_END_GEN, quest_random_gen_hero_hook, "rand_gen_hero"); - add_hook_new(HOOK_BUILD_ROOM1, quest_random_gen_hook, "rand_gen", NULL); - add_hook_new(HOOK_FEELING, quest_random_feeling_hook, "rand_feel", NULL); - add_hook_new(HOOK_CHAR_DUMP, quest_random_dump_hook, "rand_dump", NULL); + add_hook_new(HOOK_LEVEL_END_GEN, quest_random_gen_hero_hook, "rand_gen_hero", NULL); + add_hook_new(HOOK_BUILD_ROOM1, quest_random_gen_hook, "rand_gen", NULL); + add_hook_new(HOOK_FEELING, quest_random_feeling_hook, "rand_feel", NULL); + add_hook_new(HOOK_CHAR_DUMP, quest_random_dump_hook, "rand_dump", NULL); return (FALSE); } |