diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2014-12-19 01:08:57 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2014-12-23 12:07:54 +0100 |
| commit | f27d61944eba70b619a8ab31f4dba10f8e874a94 (patch) | |
| tree | ec5041cd385d0ae940d48f21e65cae0ff4c9cafe /src | |
| parent | 0ff3645a99ce2ba66e8309c0d34d7a7b2ad5ef51 (diff) | |
Update HOOK_{LEVEL_REGEN,NEW_LEVEL} to new-style hook
Diffstat (limited to 'src')
| -rw-r--r-- | src/dungeon.cc | 2 | ||||
| -rw-r--r-- | src/generate.cc | 2 | ||||
| -rw-r--r-- | src/q_rand.cc | 6 | ||||
| -rw-r--r-- | src/q_thrain.cc | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/dungeon.cc b/src/dungeon.cc index 19d9907f..e17497cf 100644 --- a/src/dungeon.cc +++ b/src/dungeon.cc @@ -5809,7 +5809,7 @@ void play_game(bool_ new_game) if (dun_level) p_ptr->wild_mode = FALSE; /* Make a new level */ - process_hooks(HOOK_NEW_LEVEL, "(d)", is_quest(dun_level)); + process_hooks_new(HOOK_NEW_LEVEL, NULL, NULL); generate_cave(); } diff --git a/src/generate.cc b/src/generate.cc index 09bd0160..d215ea4e 100644 --- a/src/generate.cc +++ b/src/generate.cc @@ -8273,7 +8273,7 @@ static void wipe_special_level(void) /* No special levels on the surface */ if (!dun_level) return; - process_hooks(HOOK_LEVEL_REGEN, "()"); + process_hooks_new(HOOK_LEVEL_REGEN, NULL, NULL); /* Calculate relative depth */ level = dun_level - d_info[dungeon_type].mindepth; diff --git a/src/q_rand.cc b/src/q_rand.cc index 33764f88..290301d9 100644 --- a/src/q_rand.cc +++ b/src/q_rand.cc @@ -399,7 +399,7 @@ static bool_ quest_random_death_hook(void *, void *in_, void *) return (FALSE); } -static bool_ quest_random_turn_hook(const char *fmt) +static bool_ quest_random_turn_hook(void *, void *, void *) { quest[QUEST_RANDOM].data[0] = 0; quest[QUEST_RANDOM].data[1] = 0; @@ -617,8 +617,8 @@ 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 (HOOK_NEW_LEVEL, quest_random_turn_hook, "rand_new_lvl"); - add_hook (HOOK_LEVEL_REGEN, quest_random_turn_hook, "rand_regen_lvl"); + 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 (HOOK_BUILD_ROOM1, quest_random_gen_hook, "rand_gen"); add_hook_new(HOOK_FEELING, quest_random_feeling_hook, "rand_feel", NULL); diff --git a/src/q_thrain.cc b/src/q_thrain.cc index 71c7bfb3..d81dc2b3 100644 --- a/src/q_thrain.cc +++ b/src/q_thrain.cc @@ -204,7 +204,7 @@ static bool_ quest_thrain_move_hook(void *, void *in_, void *) return (FALSE); } -static bool_ quest_thrain_turn_hook(const char *fmt) +static bool_ quest_thrain_turn_hook(void *, void *, void *) { cquest.data[1] = 0; cquest.data[2] = 0; @@ -227,8 +227,8 @@ bool_ quest_thrain_init_hook(int q) } if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED)) { - add_hook (HOOK_LEVEL_REGEN, quest_thrain_turn_hook, "thrain_regen_lvl"); - add_hook (HOOK_NEW_LEVEL, quest_thrain_turn_hook, "thrain_new_lvl"); + add_hook_new(HOOK_LEVEL_REGEN, quest_thrain_turn_hook, "thrain_regen_lvl", NULL); + add_hook_new(HOOK_NEW_LEVEL, quest_thrain_turn_hook, "thrain_new_lvl", NULL); add_hook (HOOK_BUILD_ROOM1, quest_thrain_gen_hook, "thrain_gen"); add_hook_new(HOOK_FEELING, quest_thrain_feeling_hook, "thrain_feel", NULL); add_hook_new(HOOK_MONSTER_DEATH, quest_thrain_death_hook, "thrain_death", NULL); |