Update HOOK_MOVE to new-style hook

6 files changed, 34 insertions, 46 deletions

diff --git a/src/cmd1.cc b/src/cmd1.cc
index 2aacbabd..a865a10f 100644
--- a/src/cmd1.cc
+++ b/src/cmd1.cc
@@ -3100,8 +3100,6 @@ void move_player_aux(int dir, int do_pickup, int run, bool_ disarm)
 	}
 
 	/* Some hooks */
-	if (process_hooks(HOOK_MOVE, "(d,d)", y, x)) return;
-
 	{
 		hook_move_in in = { y, x };
 		if (process_hooks_new(HOOK_MOVE, &in, NULL)) {
diff --git a/src/q_betwen.cc b/src/q_betwen.cc
index f8d0ff7a..d1d0e8df 100644
--- a/src/q_betwen.cc
+++ b/src/q_betwen.cc
@@ -3,14 +3,13 @@
 
 #define cquest (quest[QUEST_BETWEEN])
 
-static bool_ quest_between_move_hook(const char *fmt)
+static bool_ quest_between_move_hook(void *, void *in_, void *)
 {
-	s32b y;
-	s32b x;
+	struct hook_move_in *in = static_cast<struct hook_move_in *>(in_);
+	s32b y = in->y;
+	s32b x = in->x;
 	cave_type *c_ptr;
 
-	y = get_next_arg(fmt);
-	x = get_next_arg(fmt);
 	c_ptr = &cave[y][x];
 
 	if (cquest.status != QUEST_STATUS_TAKEN) return FALSE;
@@ -188,10 +187,10 @@ bool_ quest_between_init_hook(int q)
 {
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MOVE, quest_between_move_hook, "between_move");
-		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    (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_CHAR_DUMP,  quest_between_dump_hook,   "between_dump", NULL);
 	add_hook    (HOOK_INIT_QUEST, quest_between_forbid_hook, "between_forbid");
diff --git a/src/q_narsil.cc b/src/q_narsil.cc
index 119d3ada..e050a551 100644
--- a/src/q_narsil.cc
+++ b/src/q_narsil.cc
@@ -3,17 +3,15 @@
 
 #define cquest (quest[QUEST_NARSIL])
 
-static bool_ quest_narsil_move_hook(const char *fmt)
+static bool_ quest_narsil_move_hook(void *, void *in_, void *)
 {
-	s32b y, x;
-	cave_type *c_ptr;
+	struct hook_move_in *in = static_cast<struct hook_move_in *>(in_);
+	s32b y = in->y;
+	s32b x = in->x;
+	cave_type *c_ptr = &cave[y][x];
 	int i;
 	object_type *o_ptr;
 
-	y = get_next_arg(fmt);
-	x = get_next_arg(fmt);
-	c_ptr = &cave[y][x];
-
 	if (cquest.status != QUEST_STATUS_TAKEN) return FALSE;
 
 	/* The castle of Aragorn */
@@ -53,7 +51,7 @@ static bool_ quest_narsil_move_hook(const char *fmt)
 	/* Continue the plot */
 	cquest.status = QUEST_STATUS_FINISHED;
 
-	del_hook(HOOK_MOVE, quest_narsil_move_hook);
+	del_hook_new(HOOK_MOVE, quest_narsil_move_hook);
 	process_hooks_restart = TRUE;
 
 	return TRUE;
@@ -95,7 +93,7 @@ static bool_ quest_narsil_identify_hook(const char *fmt)
 				}
 			}
 
-			add_hook(HOOK_MOVE, quest_narsil_move_hook, "narsil_move");
+			add_hook_new(HOOK_MOVE, quest_narsil_move_hook, "narsil_move", NULL);
 			del_hook(HOOK_IDENTIFY, quest_narsil_identify_hook);
 			process_hooks_restart = TRUE;
 		}
@@ -108,7 +106,7 @@ bool_ quest_narsil_init_hook(int q_idx)
 {
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MOVE, quest_narsil_move_hook, "narsil_move");
+		add_hook_new(HOOK_MOVE, quest_narsil_move_hook, "narsil_move", NULL);
 	}
 	if (cquest.status == QUEST_STATUS_UNTAKEN) add_hook(HOOK_IDENTIFY, quest_narsil_identify_hook, "narsil_id");
 	add_hook_new(HOOK_CHAR_DUMP, quest_narsil_dump_hook, "narsil_dump", NULL);
diff --git a/src/q_one.cc b/src/q_one.cc
index 4f794b07..ea6b93fc 100644
--- a/src/q_one.cc
+++ b/src/q_one.cc
@@ -3,14 +3,12 @@
 
 #define cquest (quest[QUEST_ONE])
 
-static bool_ quest_one_move_hook(const char *fmt)
+static bool_ quest_one_move_hook(void *, void *in_, void *)
 {
-	s32b y, x;
-	cave_type *c_ptr;
-
-	y = get_next_arg(fmt);
-	x = get_next_arg(fmt);
-	c_ptr = &cave[y][x];
+	struct hook_move_in *in = static_cast<struct hook_move_in *>(in_);
+	s32b y = in->y;
+	s32b x = in->x;
+	cave_type *c_ptr = &cave[y][x];
 
 	if (cquest.status == QUEST_STATUS_UNTAKEN)
 	{
@@ -357,7 +355,7 @@ bool_ quest_one_init_hook(int q_idx)
 	}
 	if (cquest.status == QUEST_STATUS_UNTAKEN)
 	{
-		add_hook(HOOK_MOVE, quest_one_move_hook, "one_move");
+		add_hook_new(HOOK_MOVE, quest_one_move_hook, "one_move", NULL);
 	}
 	add_hook_new(HOOK_CHAR_DUMP, quest_one_dump_hook, "one_dump", NULL);
 	add_hook    (HOOK_CALC_HP,   quest_one_hp_hook,   "one_hp");
diff --git a/src/q_thrain.cc b/src/q_thrain.cc
index c22b39e9..ba6aef0d 100644
--- a/src/q_thrain.cc
+++ b/src/q_thrain.cc
@@ -176,15 +176,12 @@ static bool_ quest_thrain_feeling_hook(const char *fmt)
 	return (FALSE);
 }
 
-static bool_ quest_thrain_move_hook(const char *fmt)
+static bool_ quest_thrain_move_hook(void *, void *in_, void *)
 {
-	s32b y;
-	s32b x;
-	cave_type *c_ptr;
-
-	y = get_next_arg(fmt);
-	x = get_next_arg(fmt);
-	c_ptr = &cave[y][x];
+	struct hook_move_in *in = static_cast<struct hook_move_in *>(in_);
+	s32b y = in->y;
+	s32b x = in->x;
+	cave_type *c_ptr = &cave[y][x];
 
 	if (dungeon_type != DUNGEON_DOL_GULDUR) return (FALSE);
 	if (cquest.data[0] != dun_level) return (FALSE);
@@ -227,7 +224,7 @@ bool_ quest_thrain_init_hook(int q)
 	}
 	if ((cquest.status >= QUEST_STATUS_TAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
-		add_hook(HOOK_MOVE, quest_thrain_move_hook, "thrain_move");
+		add_hook_new(HOOK_MOVE, quest_thrain_move_hook, "thrain_move", NULL);
 	}
 	if ((cquest.status >= QUEST_STATUS_UNTAKEN) && (cquest.status < QUEST_STATUS_FINISHED))
 	{
diff --git a/src/q_ultrag.cc b/src/q_ultrag.cc
index cddacda4..7e9fdbd4 100644
--- a/src/q_ultrag.cc
+++ b/src/q_ultrag.cc
@@ -3,14 +3,12 @@
 
 #define cquest (quest[QUEST_ULTRA_GOOD])
 
-static bool_ quest_ultra_good_move_hook(const char *fmt)
+static bool_ quest_ultra_good_move_hook(void *, void *in_, void *)
 {
-	s32b y, x;
-	cave_type *c_ptr;
-
-	y = get_next_arg(fmt);
-	x = get_next_arg(fmt);
-	c_ptr = &cave[y][x];
+	struct hook_move_in *in = static_cast<struct hook_move_in *>(in_);
+	s32b y = in->y;
+	s32b x = in->x;
+	cave_type *c_ptr = &cave[y][x];
 
 	if (cquest.status == QUEST_STATUS_UNTAKEN)
 	{
@@ -271,7 +269,7 @@ bool_ quest_ultra_good_init_hook(int q)
 	}
 	if (cquest.status == QUEST_STATUS_UNTAKEN)
 	{
-		add_hook(HOOK_MOVE, quest_ultra_good_move_hook, "ultrag_move");
+		add_hook_new(HOOK_MOVE, quest_ultra_good_move_hook, "ultrag_move", NULL);
 	}
 	add_hook_new(HOOK_CHAR_DUMP, quest_ultra_good_dump_hook, "ultrag_dump", NULL);
 	return (FALSE);