Update HOOK_FEELING to new-style hook

4 files changed, 15 insertions, 15 deletions

diff --git a/src/cmd4.cc b/src/cmd4.cc
index 13ce6d0f..1878379e 100644
--- a/src/cmd4.cc
+++ b/src/cmd4.cc
@@ -2801,7 +2801,7 @@ void do_cmd_feeling(void)
 	}
 
 	/* Hooked feelings ? */
-	if (process_hooks(HOOK_FEELING, "(d)", is_quest(dun_level)))
+	if (process_hooks_new(HOOK_FEELING, NULL, NULL))
 	{
 		return;
 	}
diff --git a/src/q_rand.cc b/src/q_rand.cc
index 71ff645a..c631e8b5 100644
--- a/src/q_rand.cc
+++ b/src/q_rand.cc
@@ -408,7 +408,7 @@ static bool_ quest_random_turn_hook(const char *fmt)
 	return (FALSE);
 }
 
-static bool_ quest_random_feeling_hook(const char *fmt)
+static bool_ quest_random_feeling_hook(void *, void *, void *)
 {
 	if (!(dungeon_flags1 & DF1_PRINCIPAL)) return (FALSE);
 	if ((dun_level < 1) || (dun_level >= MAX_RANDOM_QUEST)) return (FALSE);
@@ -623,7 +623,7 @@ bool_ quest_random_init_hook(int q_idx)
 	add_hook    (HOOK_LEVEL_REGEN,   quest_random_turn_hook,     "rand_regen_lvl");
 	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    (HOOK_FEELING,       quest_random_feeling_hook,  "rand_feel");
+	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);
 }
diff --git a/src/q_thief.cc b/src/q_thief.cc
index 912309a9..4d78763b 100644
--- a/src/q_thief.cc
+++ b/src/q_thief.cc
@@ -150,14 +150,14 @@ static bool_ quest_thieves_finish_hook(const char *fmt)
 	return TRUE;
 }
 
-static bool_ quest_thieves_feeling_hook(const char *fmt)
+static bool_ quest_thieves_feeling_hook(void *, void *, void *)
 {
 	if (p_ptr->inside_quest != QUEST_THIEVES) return FALSE;
 
 	msg_print("You wake up in a prison cell.");
 	msg_print("All your possessions have been stolen!");
 
-	del_hook(HOOK_FEELING, quest_thieves_feeling_hook);
+	del_hook_new(HOOK_FEELING, quest_thieves_feeling_hook);
 	process_hooks_restart = TRUE;
 
 	return TRUE;
@@ -167,10 +167,10 @@ bool_ quest_thieves_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_END_TURN, quest_thieves_hook, "thieves_end_turn");
-		add_hook(HOOK_QUEST_FINISH, quest_thieves_finish_hook, "thieves_finish");
-		add_hook(HOOK_GEN_QUEST, quest_thieves_gen_hook, "thieves_geb");
-		add_hook(HOOK_FEELING, quest_thieves_feeling_hook, "thieves_feel");
+		add_hook    (HOOK_END_TURN,     quest_thieves_hook,         "thieves_end_turn");
+		add_hook    (HOOK_QUEST_FINISH, quest_thieves_finish_hook,  "thieves_finish");
+		add_hook    (HOOK_GEN_QUEST,    quest_thieves_gen_hook,     "thieves_geb");
+		add_hook_new(HOOK_FEELING,      quest_thieves_feeling_hook, "thieves_feel", NULL);
 	}
 	return (FALSE);
 }
diff --git a/src/q_thrain.cc b/src/q_thrain.cc
index ba6aef0d..d6cd725a 100644
--- a/src/q_thrain.cc
+++ b/src/q_thrain.cc
@@ -163,7 +163,7 @@ static bool_ quest_thrain_gen_hook(const char *fmt)
 	return (TRUE);
 }
 
-static bool_ quest_thrain_feeling_hook(const char *fmt)
+static bool_ quest_thrain_feeling_hook(void *, void *, void *)
 {
 	if (dungeon_type != DUNGEON_DOL_GULDUR) return (FALSE);
 	if (cquest.data[0] != dun_level) return (FALSE);
@@ -228,11 +228,11 @@ 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(HOOK_BUILD_ROOM1, quest_thrain_gen_hook, "thrain_gen");
-		add_hook(HOOK_FEELING, quest_thrain_feeling_hook, "thrain_feel");
-		add_hook(HOOK_MONSTER_DEATH, quest_thrain_death_hook, "thrain_death");
+		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    (HOOK_BUILD_ROOM1,   quest_thrain_gen_hook,     "thrain_gen");
+		add_hook_new(HOOK_FEELING,       quest_thrain_feeling_hook, "thrain_feel", NULL);
+		add_hook    (HOOK_MONSTER_DEATH, quest_thrain_death_hook,   "thrain_death");
 	}
 	return (FALSE);
 }