HPM Hooks Update

Signed-off-by: HerculesWSAPI <dev@herc.ws>

5 files changed, 67 insertions, 0 deletions

diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index a7d594b0f..d2b4d2fd9 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -606,6 +606,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
 		{ "NORMALITEM_INFO", sizeof(struct NORMALITEM_INFO), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_ADD_ITEM_TO_MAIL", sizeof(struct PACKET_CZ_ADD_ITEM_TO_MAIL), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_CHECKNAME", sizeof(struct PACKET_CZ_CHECKNAME), SERVER_TYPE_MAP },
+		{ "PACKET_CZ_MEMORIALDUNGEON_COMMAND", sizeof(struct PACKET_CZ_MEMORIALDUNGEON_COMMAND), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_OPEN_UI", sizeof(struct PACKET_CZ_OPEN_UI), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_PC_BUY_CASH_POINT_ITEM", sizeof(struct PACKET_CZ_PC_BUY_CASH_POINT_ITEM), SERVER_TYPE_MAP },
 		{ "PACKET_CZ_PC_BUY_CASH_POINT_ITEM_sub", sizeof(struct PACKET_CZ_PC_BUY_CASH_POINT_ITEM_sub), SERVER_TYPE_MAP },
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 93fe41952..f80dc9003 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -2614,6 +2614,8 @@ typedef void (*HPMHOOK_pre_clif_petEvolutionResult) (int *fd, enum pet_evolution
 typedef void (*HPMHOOK_post_clif_petEvolutionResult) (int fd, enum pet_evolution_result result);
 typedef void (*HPMHOOK_pre_clif_party_dead_notification) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_party_dead_notification) (struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pMemorialDungeonCommand) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pMemorialDungeonCommand) (int fd, struct map_session_data *sd);
 #endif // MAP_CLIF_H
 #ifdef COMMON_CORE_H /* cmdline */
 typedef void (*HPMHOOK_pre_cmdline_init) (void);
@@ -3140,6 +3142,8 @@ typedef bool (*HPMHOOK_pre_instance_valid) (int *instance_id);
 typedef bool (*HPMHOOK_post_instance_valid) (bool retVal___, int instance_id);
 typedef int (*HPMHOOK_pre_instance_destroy_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
 typedef int (*HPMHOOK_post_instance_destroy_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+typedef void (*HPMHOOK_pre_instance_force_destroy) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_instance_force_destroy) (struct map_session_data *sd);
 #endif // MAP_INSTANCE_H
 #ifdef CHAR_INT_ACHIEVEMENT_H /* inter_achievement */
 typedef int (*HPMHOOK_pre_inter_achievement_sql_init) (void);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index a0c2603a6..8762975e1 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -2206,6 +2206,8 @@ struct {
 	struct HPMHookPoint *HP_clif_petEvolutionResult_post;
 	struct HPMHookPoint *HP_clif_party_dead_notification_pre;
 	struct HPMHookPoint *HP_clif_party_dead_notification_post;
+	struct HPMHookPoint *HP_clif_pMemorialDungeonCommand_pre;
+	struct HPMHookPoint *HP_clif_pMemorialDungeonCommand_post;
 	struct HPMHookPoint *HP_cmdline_init_pre;
 	struct HPMHookPoint *HP_cmdline_init_post;
 	struct HPMHookPoint *HP_cmdline_final_pre;
@@ -2700,6 +2702,8 @@ struct {
 	struct HPMHookPoint *HP_instance_valid_post;
 	struct HPMHookPoint *HP_instance_destroy_timer_pre;
 	struct HPMHookPoint *HP_instance_destroy_timer_post;
+	struct HPMHookPoint *HP_instance_force_destroy_pre;
+	struct HPMHookPoint *HP_instance_force_destroy_post;
 	struct HPMHookPoint *HP_intif_parse_pre;
 	struct HPMHookPoint *HP_intif_parse_post;
 	struct HPMHookPoint *HP_intif_create_pet_pre;
@@ -8785,6 +8789,8 @@ struct {
 	int HP_clif_petEvolutionResult_post;
 	int HP_clif_party_dead_notification_pre;
 	int HP_clif_party_dead_notification_post;
+	int HP_clif_pMemorialDungeonCommand_pre;
+	int HP_clif_pMemorialDungeonCommand_post;
 	int HP_cmdline_init_pre;
 	int HP_cmdline_init_post;
 	int HP_cmdline_final_pre;
@@ -9279,6 +9285,8 @@ struct {
 	int HP_instance_valid_post;
 	int HP_instance_destroy_timer_pre;
 	int HP_instance_destroy_timer_post;
+	int HP_instance_force_destroy_pre;
+	int HP_instance_force_destroy_post;
 	int HP_intif_parse_pre;
 	int HP_intif_parse_post;
 	int HP_intif_create_pet_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 5eecc1a6f..2f3f1840f 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1127,6 +1127,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->pPetEvolution, HP_clif_pPetEvolution) },
 	{ HP_POP(clif->petEvolutionResult, HP_clif_petEvolutionResult) },
 	{ HP_POP(clif->party_dead_notification, HP_clif_party_dead_notification) },
+	{ HP_POP(clif->pMemorialDungeonCommand, HP_clif_pMemorialDungeonCommand) },
 /* cmdline_interface */
 	{ HP_POP(cmdline->init, HP_cmdline_init) },
 	{ HP_POP(cmdline->final, HP_cmdline_final) },
@@ -1386,6 +1387,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(instance->set_timeout, HP_instance_set_timeout) },
 	{ HP_POP(instance->valid, HP_instance_valid) },
 	{ HP_POP(instance->destroy_timer, HP_instance_destroy_timer) },
+	{ HP_POP(instance->force_destroy, HP_instance_force_destroy) },
 /* intif_interface */
 	{ HP_POP(intif->parse, HP_intif_parse) },
 	{ HP_POP(intif->create_pet, HP_intif_create_pet) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 001863c0e..860e47f1b 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -28756,6 +28756,32 @@ void HP_clif_party_dead_notification(struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_pMemorialDungeonCommand(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pMemorialDungeonCommand_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMemorialDungeonCommand_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pMemorialDungeonCommand_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pMemorialDungeonCommand(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pMemorialDungeonCommand_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pMemorialDungeonCommand_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pMemorialDungeonCommand_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
 /* cmdline_interface */
 void HP_cmdline_init(void) {
 	int hIndex = 0;
@@ -35450,6 +35476,32 @@ int HP_instance_destroy_timer(int tid, int64 tick, int id, intptr_t data) {
 	}
 	return retVal___;
 }
+void HP_instance_force_destroy(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_instance_force_destroy_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_instance_force_destroy_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_instance_force_destroy_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.instance.force_destroy(sd);
+	}
+	if (HPMHooks.count.HP_instance_force_destroy_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_instance_force_destroy_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_instance_force_destroy_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
 /* intif_interface */
 int HP_intif_parse(int fd) {
 	int hIndex = 0;