Update HOOK_GEN_QUEST to new-style hook

15 files changed, 56 insertions, 63 deletions

diff --git a/src/generate.cc b/src/generate.cc
index b0d2bbe7..09bd0160 100644
--- a/src/generate.cc
+++ b/src/generate.cc
@@ -8198,14 +8198,6 @@ static void arena_gen(void)
 
 
 /*
- * Generate a quest level
- */
-static void quest_gen(void)
-{
-	process_hooks(HOOK_GEN_QUEST, "(d)", is_quest(dun_level));
-}
-
-/*
  * Creates a special level
  */
 
@@ -8563,7 +8555,7 @@ void generate_cave(void)
 			/* Quest levels -KMW- */
 			else if (p_ptr->inside_quest)
 			{
-				quest_gen();
+				process_hooks_new(HOOK_GEN_QUEST, NULL, NULL);
 			}
 
 			/* Special levels */
diff --git a/src/q_betwen.cc b/src/q_betwen.cc
index 5cbf91e6..a4cd27ac 100644
--- a/src/q_betwen.cc
+++ b/src/q_betwen.cc
@@ -51,7 +51,7 @@ static bool_ quest_between_move_hook(void *, void *in_, void *)
 	return FALSE;
 }
 
-static bool_ quest_between_gen_hook(const char *fmt)
+static bool_ quest_between_gen_hook(void *, void *, void *)
 {
 	int x, y;
 	int xstart = 2;
@@ -187,10 +187,10 @@ bool_ quest_between_init_hook(int q)
 {
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook_new(HOOK_MOVE, quest_between_move_hook, "between_move", NULL);
-		add_hook    (HOOK_GEN_QUEST, quest_between_gen_hook, "between_gen");
-		add_hook    (HOOK_QUEST_FINISH, quest_between_finish_hook, "between_finish");
-		add_hook    (HOOK_MONSTER_DEATH, quest_between_death_hook, "between_death");
+		add_hook_new(HOOK_MOVE,          quest_between_move_hook,   "between_move", NULL);
+		add_hook_new(HOOK_GEN_QUEST,     quest_between_gen_hook,    "between_gen", NULL);
+		add_hook    (HOOK_QUEST_FINISH,  quest_between_finish_hook, "between_finish");
+		add_hook    (HOOK_MONSTER_DEATH, quest_between_death_hook,  "between_death");
 	}
 	add_hook_new(HOOK_CHAR_DUMP,  quest_between_dump_hook,   "between_dump",   NULL);
 	add_hook_new(HOOK_INIT_QUEST, quest_between_forbid_hook, "between_forbid", NULL);
diff --git a/src/q_dragons.cc b/src/q_dragons.cc
index e63f662a..d6dd69d9 100644
--- a/src/q_dragons.cc
+++ b/src/q_dragons.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_DRAGONS])
 
-static bool_ quest_dragons_gen_hook(const char *fmt)
+static bool_ quest_dragons_gen_hook(void *, void *, void *)
 {
 	int x, y, i;
 	int xstart = 2;
@@ -113,8 +113,8 @@ static bool_ quest_dragons_death_hook(const char *fmt)
 	if (mcnt <= 1)
 	{
 		quest[p_ptr->inside_quest].status = QUEST_STATUS_COMPLETED;
-		del_hook(HOOK_MONSTER_DEATH, quest_dragons_death_hook);
-		del_hook(HOOK_GEN_QUEST, quest_dragons_gen_hook);
+		del_hook    (HOOK_MONSTER_DEATH, quest_dragons_death_hook);
+		del_hook_new(HOOK_GEN_QUEST,     quest_dragons_gen_hook);
 		process_hooks_restart = TRUE;
 
 		cmsg_print(TERM_YELLOW, "Gondolin is safer now.");
@@ -144,9 +144,9 @@ bool_ quest_dragons_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MONSTER_DEATH, quest_dragons_death_hook, "dragons_monster_death");
-		add_hook(HOOK_QUEST_FINISH, quest_dragons_finish_hook, "dragons_finish");
-		add_hook(HOOK_GEN_QUEST, quest_dragons_gen_hook, "dragons_geb");
+		add_hook    (HOOK_MONSTER_DEATH, quest_dragons_death_hook,  "dragons_monster_death");
+		add_hook    (HOOK_QUEST_FINISH,  quest_dragons_finish_hook, "dragons_finish");
+		add_hook_new(HOOK_GEN_QUEST,     quest_dragons_gen_hook,    "dragons_geb", NULL);
 	}
 	return (FALSE);
 }
diff --git a/src/q_eol.cc b/src/q_eol.cc
index 8495b280..c9dac0c0 100644
--- a/src/q_eol.cc
+++ b/src/q_eol.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_EOL])
 
-static bool_ quest_eol_gen_hook(const char *fmt)
+static bool_ quest_eol_gen_hook(void *, void *, void *)
 {
 	int x, y;
 	bool_ done = FALSE;
@@ -192,7 +192,7 @@ bool_ quest_eol_init_hook(int q)
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
 		add_hook    (HOOK_MONSTER_DEATH, quest_eol_death_hook,  "eol_death");
-		add_hook    (HOOK_GEN_QUEST,     quest_eol_gen_hook,    "eol_gen");
+		add_hook_new(HOOK_GEN_QUEST,     quest_eol_gen_hook,    "eol_gen", NULL);
 		add_hook_new(HOOK_STAIR,         quest_eol_stair_hook,  "eol_stair", NULL);
 		add_hook    (HOOK_QUEST_FAIL,    quest_eol_fail_hook,   "eol_fail");
 		add_hook    (HOOK_QUEST_FINISH,  quest_eol_finish_hook, "eol_finish");
diff --git a/src/q_evil.cc b/src/q_evil.cc
index 64a9fabc..e21c4826 100644
--- a/src/q_evil.cc
+++ b/src/q_evil.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_EVIL])
 
-static bool_ quest_evil_gen_hook(const char *fmt)
+static bool_ quest_evil_gen_hook(void *, void *, void *)
 {
 	int x, y, i;
 	int xstart = 2;
@@ -80,8 +80,8 @@ static bool_ quest_evil_death_hook(const char *fmt)
 		/* TODO: change to COMPLETED and remove NULL when mayor is added */
 		quest[p_ptr->inside_quest].status = QUEST_STATUS_FINISHED;
 		*(quest[p_ptr->inside_quest].plot) = QUEST_NULL;
-		del_hook(HOOK_MONSTER_DEATH, quest_evil_death_hook);
-		del_hook(HOOK_GEN_QUEST, quest_evil_gen_hook);
+		del_hook    (HOOK_MONSTER_DEATH, quest_evil_death_hook);
+		del_hook_new(HOOK_GEN_QUEST,     quest_evil_gen_hook);
 		process_hooks_restart = TRUE;
 
 		cmsg_print(TERM_YELLOW, "Khazad-Dum is safer now.");
@@ -111,9 +111,9 @@ bool_ quest_evil_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MONSTER_DEATH, quest_evil_death_hook, "evil_monster_death");
-		add_hook(HOOK_QUEST_FINISH, quest_evil_finish_hook, "evil_finish");
-		add_hook(HOOK_GEN_QUEST, quest_evil_gen_hook, "evil_geb");
+		add_hook    (HOOK_MONSTER_DEATH, quest_evil_death_hook,  "evil_monster_death");
+		add_hook    (HOOK_QUEST_FINISH,  quest_evil_finish_hook, "evil_finish");
+		add_hook_new(HOOK_GEN_QUEST,     quest_evil_gen_hook,    "evil_geb", NULL);
 	}
 	return (FALSE);
 }
diff --git a/src/q_fireprof.cc b/src/q_fireprof.cc
index 4b636e62..9e5335a3 100644
--- a/src/q_fireprof.cc
+++ b/src/q_fireprof.cc
@@ -483,7 +483,7 @@ bool_ quest_fireproof_describe(FILE *hook_file)
 	return TRUE;
 }
 
-static bool_ fireproof_gen_hook(const char *fmt)
+static bool_ fireproof_gen_hook(void *, void *, void *)
 {
 	fireproof_settings const *settings = fireproof_get_settings();
 
@@ -579,7 +579,7 @@ bool_ quest_fireproof_init_hook(int q)
 	if ((cquest.status >= QUEST_STATUS_UNTAKEN) &&
 	    (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook    (HOOK_GEN_QUEST, fireproof_gen_hook  , "fireproof_gen_hook");
+		add_hook_new(HOOK_GEN_QUEST, fireproof_gen_hook  , "fireproof_gen_hook", NULL);
 		add_hook    (HOOK_GET      , fireproof_get_hook  , "fireproof_get_hook");
 		add_hook_new(HOOK_STAIR    , fireproof_stair_hook, "fireproof_stair_hook", NULL);
 	}
diff --git a/src/q_haunted.cc b/src/q_haunted.cc
index 83f97cb2..a57e8656 100644
--- a/src/q_haunted.cc
+++ b/src/q_haunted.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_HAUNTED])
 
-static bool_ quest_haunted_gen_hook(const char *fmt)
+static bool_ quest_haunted_gen_hook(void *, void *, void *)
 {
 	int x, y, i, m_idx;
 	int xstart = 2;
@@ -110,8 +110,8 @@ static bool_ quest_haunted_death_hook(const char *fmt)
 	if (mcnt <= 1)
 	{
 		quest[p_ptr->inside_quest].status = QUEST_STATUS_COMPLETED;
-		del_hook(HOOK_MONSTER_DEATH, quest_haunted_death_hook);
-		del_hook(HOOK_GEN_QUEST, quest_haunted_gen_hook);
+		del_hook    (HOOK_MONSTER_DEATH, quest_haunted_death_hook);
+		del_hook_new(HOOK_GEN_QUEST,     quest_haunted_gen_hook);
 		process_hooks_restart = TRUE;
 
 		cmsg_print(TERM_YELLOW, "Minas Anor is safer now.");
@@ -141,9 +141,9 @@ bool_ quest_haunted_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MONSTER_DEATH, quest_haunted_death_hook, "haunted_monster_death");
-		add_hook(HOOK_QUEST_FINISH, quest_haunted_finish_hook, "haunted_finish");
-		add_hook(HOOK_GEN_QUEST, quest_haunted_gen_hook, "haunted_geb");
+		add_hook    (HOOK_MONSTER_DEATH, quest_haunted_death_hook,  "haunted_monster_death");
+		add_hook    (HOOK_QUEST_FINISH,  quest_haunted_finish_hook, "haunted_finish");
+		add_hook_new(HOOK_GEN_QUEST,     quest_haunted_gen_hook,    "haunted_geb", NULL);
 	}
 	return (FALSE);
 }
diff --git a/src/q_invas.cc b/src/q_invas.cc
index 42a83f8b..92257194 100644
--- a/src/q_invas.cc
+++ b/src/q_invas.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_INVASION])
 
-static bool_ quest_invasion_gen_hook(const char *fmt)
+static bool_ quest_invasion_gen_hook(void *, void *, void *)
 {
 	int x, y;
 	int xstart = 2;
@@ -197,7 +197,7 @@ bool_ quest_invasion_init_hook(int q_idx)
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
 		add_hook    (HOOK_MONSTER_AI,    quest_invasion_ai_hook,    "invasion_ai");
-		add_hook    (HOOK_GEN_QUEST,     quest_invasion_gen_hook,   "invasion_gen");
+		add_hook_new(HOOK_GEN_QUEST,     quest_invasion_gen_hook,   "invasion_gen", NULL);
 		add_hook    (HOOK_MONSTER_DEATH, quest_invasion_death_hook, "invasion_death");
 		add_hook_new(HOOK_STAIR,         quest_invasion_stair_hook, "invasion_stair", NULL);
 	}
diff --git a/src/q_library.cc b/src/q_library.cc
index afa4284d..c3305ea9 100644
--- a/src/q_library.cc
+++ b/src/q_library.cc
@@ -298,7 +298,7 @@ static void library_quest_fill_book()
 	screen_load();
 }
 
-static bool_ quest_library_gen_hook(const char *fmt)
+static bool_ quest_library_gen_hook(void *, void *, void *)
 {
 	/* Only if player doing this quest */
 	if (p_ptr->inside_quest != QUEST_LIBRARY)
@@ -494,7 +494,7 @@ bool_ quest_library_init_hook(int q)
 	if ((cquest.status >= QUEST_STATUS_UNTAKEN) &&
 	    (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook    (HOOK_GEN_QUEST    , quest_library_gen_hook          , "library_gen_hook");
+		add_hook_new(HOOK_GEN_QUEST    , quest_library_gen_hook          , "library_gen_hook", NULL);
 		add_hook_new(HOOK_STAIR        , quest_library_stair_hook        , "library_stair_hook", NULL);
 		add_hook    (HOOK_MONSTER_DEATH, quest_library_monster_death_hook, "library_monster_death_hook");
 	}
diff --git a/src/q_nirna.cc b/src/q_nirna.cc
index a0774cb5..9772709c 100644
--- a/src/q_nirna.cc
+++ b/src/q_nirna.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_NIRNAETH])
 
-static bool_ quest_nirnaeth_gen_hook(const char *fmt)
+static bool_ quest_nirnaeth_gen_hook(void *, void *, void *)
 {
 	int x, y;
 	int xstart = 2;
@@ -108,7 +108,7 @@ bool_ quest_nirnaeth_init_hook(int q_idx)
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
 		add_hook    (HOOK_MONSTER_DEATH, quest_nirnaeth_death_hook,  "nirnaeth_death");
-		add_hook    (HOOK_GEN_QUEST,     quest_nirnaeth_gen_hook,    "nirnaeth_gen");
+		add_hook_new(HOOK_GEN_QUEST,     quest_nirnaeth_gen_hook,    "nirnaeth_gen", NULL);
 		add_hook_new(HOOK_STAIR,         quest_nirnaeth_stair_hook,  "nirnaeth_stair", NULL);
 		add_hook    (HOOK_QUEST_FINISH,  quest_nirnaeth_finish_hook, "nirnaeth_finish");
 	}
diff --git a/src/q_spider.cc b/src/q_spider.cc
index 03305f59..474d58d1 100644
--- a/src/q_spider.cc
+++ b/src/q_spider.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_SPIDER])
 
-static bool_ quest_spider_gen_hook(const char *fmt)
+static bool_ quest_spider_gen_hook(void *, void *, void *)
 {
 	int x, y;
 	int xstart = 2;
@@ -105,9 +105,9 @@ bool_ quest_spider_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MONSTER_DEATH, quest_spider_death_hook, "spider_death");
-		add_hook(HOOK_GEN_QUEST, quest_spider_gen_hook, "spider_gen");
-		add_hook(HOOK_QUEST_FINISH, quest_spider_finish_hook, "spider_finish");
+		add_hook    (HOOK_MONSTER_DEATH, quest_spider_death_hook,  "spider_death");
+		add_hook_new(HOOK_GEN_QUEST,     quest_spider_gen_hook,    "spider_gen", NULL);
+		add_hook    (HOOK_QUEST_FINISH,  quest_spider_finish_hook, "spider_finish");
 	}
 	return (FALSE);
 }
diff --git a/src/q_thief.cc b/src/q_thief.cc
index 4d78763b..83f875ea 100644
--- a/src/q_thief.cc
+++ b/src/q_thief.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_THIEVES])
 
-static bool_ quest_thieves_gen_hook(const char *fmt)
+static bool_ quest_thieves_gen_hook(void *, void *, void *)
 {
 	int x, y;
 	int xstart = 2;
@@ -58,7 +58,7 @@ static bool_ quest_thieves_gen_hook(const char *fmt)
 		}
 	}
 
-	del_hook(HOOK_GEN_QUEST, quest_thieves_gen_hook);
+	del_hook_new(HOOK_GEN_QUEST, quest_thieves_gen_hook);
 	process_hooks_restart = TRUE;
 
 	return TRUE;
@@ -169,7 +169,7 @@ bool_ quest_thieves_init_hook(int q_idx)
 	{
 		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_GEN_QUEST,    quest_thieves_gen_hook,     "thieves_geb", NULL);
 		add_hook_new(HOOK_FEELING,      quest_thieves_feeling_hook, "thieves_feel", NULL);
 	}
 	return (FALSE);
diff --git a/src/q_troll.cc b/src/q_troll.cc
index 4a38f2d0..ceda1934 100644
--- a/src/q_troll.cc
+++ b/src/q_troll.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_TROLL])
 
-static bool_ quest_troll_gen_hook(const char *fmt)
+static bool_ quest_troll_gen_hook(void *, void *, void *)
 {
 	int x, y;
 	int xstart = 2;
@@ -175,9 +175,9 @@ bool_ quest_troll_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MONSTER_DEATH, quest_troll_death_hook, "troll_death");
-		add_hook(HOOK_GEN_QUEST, quest_troll_gen_hook, "troll_gen");
-		add_hook(HOOK_QUEST_FINISH, quest_troll_finish_hook, "troll_finish");
+		add_hook    (HOOK_MONSTER_DEATH, quest_troll_death_hook,  "troll_death");
+		add_hook_new(HOOK_GEN_QUEST,     quest_troll_gen_hook,    "troll_gen", NULL);
+		add_hook    (HOOK_QUEST_FINISH,  quest_troll_finish_hook, "troll_finish");
 	}
 	return (FALSE);
 }
diff --git a/src/q_wight.cc b/src/q_wight.cc
index ce4c5ac4..462e0416 100644
--- a/src/q_wight.cc
+++ b/src/q_wight.cc
@@ -4,7 +4,7 @@
 
 #define cquest (quest[QUEST_WIGHT])
 
-static bool_ quest_wight_gen_hook(const char *fmt)
+static bool_ quest_wight_gen_hook(void *, void *, void *)
 {
 	int x, y;
 	int xstart = 2;
@@ -154,9 +154,9 @@ bool_ quest_wight_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MONSTER_DEATH, quest_wight_death_hook, "wight_death");
-		add_hook(HOOK_GEN_QUEST, quest_wight_gen_hook, "wight_gen");
-		add_hook(HOOK_QUEST_FINISH, quest_wight_finish_hook, "wight_finish");
+		add_hook    (HOOK_MONSTER_DEATH, quest_wight_death_hook,  "wight_death");
+		add_hook_new(HOOK_GEN_QUEST,     quest_wight_gen_hook,    "wight_gen", NULL);
+		add_hook    (HOOK_QUEST_FINISH,  quest_wight_finish_hook, "wight_finish");
 	}
 	return (FALSE);
 }
diff --git a/src/q_wolves.cc b/src/q_wolves.cc
index 5da28ee7..75a50aff 100644
--- a/src/q_wolves.cc
+++ b/src/q_wolves.cc
@@ -3,7 +3,7 @@
 
 #define cquest (quest[QUEST_WOLVES])
 
-static bool_ quest_wolves_gen_hook(const char *fmt)
+static bool_ quest_wolves_gen_hook(void *, void *, void *)
 {
 	int x, y, i;
 	int xstart = 2;
@@ -93,8 +93,9 @@ static bool_ quest_wolves_death_hook(const char *fmt)
 	if (mcnt <= 1)
 	{
 		quest[p_ptr->inside_quest].status = QUEST_STATUS_COMPLETED;
-		del_hook(HOOK_MONSTER_DEATH, quest_wolves_death_hook);
-		del_hook(HOOK_GEN_QUEST, quest_wolves_gen_hook);
+
+		del_hook    (HOOK_MONSTER_DEATH, quest_wolves_death_hook);
+		del_hook_new(HOOK_GEN_QUEST,     quest_wolves_gen_hook);
 		process_hooks_restart = TRUE;
 
 		cmsg_print(TERM_YELLOW, "Lothlorien is safer now.");
@@ -124,9 +125,9 @@ bool_ quest_wolves_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MONSTER_DEATH, quest_wolves_death_hook, "wolves_monster_death");
-		add_hook(HOOK_QUEST_FINISH, quest_wolves_finish_hook, "wolves_finish");
-		add_hook(HOOK_GEN_QUEST, quest_wolves_gen_hook, "wolves_geb");
+		add_hook    (HOOK_MONSTER_DEATH, quest_wolves_death_hook,  "wolves_monster_death");
+		add_hook    (HOOK_QUEST_FINISH,  quest_wolves_finish_hook, "wolves_finish");
+		add_hook_new(HOOK_GEN_QUEST,     quest_wolves_gen_hook,    "wolves_geb", NULL);
 	}
 	return (FALSE);
 }