Update HPM

4 files changed, 188 insertions, 15 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index ea9541a40..f3b4370fb 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1378,8 +1378,8 @@ typedef void (*HPMHOOK_pre_clif_mvp_noitem) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_mvp_noitem) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_changed_dir) (struct block_list **bl, enum send_target *target);
 typedef void (*HPMHOOK_post_clif_changed_dir) (struct block_list *bl, enum send_target target);
-typedef void (*HPMHOOK_pre_clif_charnameack) (int *fd, struct block_list **bl);
-typedef void (*HPMHOOK_post_clif_charnameack) (int fd, struct block_list *bl);
+typedef void (*HPMHOOK_pre_clif_blname_ack) (int *fd, struct block_list **bl);
+typedef void (*HPMHOOK_post_clif_blname_ack) (int fd, struct block_list *bl);
 typedef void (*HPMHOOK_pre_clif_monster_hp_bar) (struct mob_data **md, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_monster_hp_bar) (struct mob_data *md, struct map_session_data *sd);
 typedef int (*HPMHOOK_pre_clif_hpmeter) (struct map_session_data **sd);
@@ -2654,6 +2654,16 @@ typedef void (*HPMHOOK_pre_clif_pNPCBarterPurchase) (int *fd, struct map_session
 typedef void (*HPMHOOK_post_clif_pNPCBarterPurchase) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pClientVersion) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pClientVersion) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_pPing) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pPing) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_ping) (struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_ping) (struct map_session_data *sd);
+typedef int (*HPMHOOK_pre_clif_pingTimer) (int *tid, int64 *tick, int *id, intptr_t *data);
+typedef int (*HPMHOOK_post_clif_pingTimer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+typedef int (*HPMHOOK_pre_clif_pingTimerSub) (struct map_session_data **sd, va_list ap);
+typedef int (*HPMHOOK_post_clif_pingTimerSub) (int retVal___, struct map_session_data *sd, va_list ap);
+typedef void (*HPMHOOK_pre_clif_pResetCooldown) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_pResetCooldown) (int fd, struct map_session_data *sd);
 #endif // MAP_CLIF_H
 #ifdef COMMON_CORE_H /* cmdline */
 typedef void (*HPMHOOK_pre_cmdline_init) (void);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 1a4d5b72a..99d6be230 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -968,8 +968,8 @@ struct {
 	struct HPMHookPoint *HP_clif_mvp_noitem_post;
 	struct HPMHookPoint *HP_clif_changed_dir_pre;
 	struct HPMHookPoint *HP_clif_changed_dir_post;
-	struct HPMHookPoint *HP_clif_charnameack_pre;
-	struct HPMHookPoint *HP_clif_charnameack_post;
+	struct HPMHookPoint *HP_clif_blname_ack_pre;
+	struct HPMHookPoint *HP_clif_blname_ack_post;
 	struct HPMHookPoint *HP_clif_monster_hp_bar_pre;
 	struct HPMHookPoint *HP_clif_monster_hp_bar_post;
 	struct HPMHookPoint *HP_clif_hpmeter_pre;
@@ -2244,6 +2244,16 @@ struct {
 	struct HPMHookPoint *HP_clif_pNPCBarterPurchase_post;
 	struct HPMHookPoint *HP_clif_pClientVersion_pre;
 	struct HPMHookPoint *HP_clif_pClientVersion_post;
+	struct HPMHookPoint *HP_clif_pPing_pre;
+	struct HPMHookPoint *HP_clif_pPing_post;
+	struct HPMHookPoint *HP_clif_ping_pre;
+	struct HPMHookPoint *HP_clif_ping_post;
+	struct HPMHookPoint *HP_clif_pingTimer_pre;
+	struct HPMHookPoint *HP_clif_pingTimer_post;
+	struct HPMHookPoint *HP_clif_pingTimerSub_pre;
+	struct HPMHookPoint *HP_clif_pingTimerSub_post;
+	struct HPMHookPoint *HP_clif_pResetCooldown_pre;
+	struct HPMHookPoint *HP_clif_pResetCooldown_post;
 	struct HPMHookPoint *HP_cmdline_init_pre;
 	struct HPMHookPoint *HP_cmdline_init_post;
 	struct HPMHookPoint *HP_cmdline_final_pre;
@@ -7643,8 +7653,8 @@ struct {
 	int HP_clif_mvp_noitem_post;
 	int HP_clif_changed_dir_pre;
 	int HP_clif_changed_dir_post;
-	int HP_clif_charnameack_pre;
-	int HP_clif_charnameack_post;
+	int HP_clif_blname_ack_pre;
+	int HP_clif_blname_ack_post;
 	int HP_clif_monster_hp_bar_pre;
 	int HP_clif_monster_hp_bar_post;
 	int HP_clif_hpmeter_pre;
@@ -8919,6 +8929,16 @@ struct {
 	int HP_clif_pNPCBarterPurchase_post;
 	int HP_clif_pClientVersion_pre;
 	int HP_clif_pClientVersion_post;
+	int HP_clif_pPing_pre;
+	int HP_clif_pPing_post;
+	int HP_clif_ping_pre;
+	int HP_clif_ping_post;
+	int HP_clif_pingTimer_pre;
+	int HP_clif_pingTimer_post;
+	int HP_clif_pingTimerSub_pre;
+	int HP_clif_pingTimerSub_post;
+	int HP_clif_pResetCooldown_pre;
+	int HP_clif_pResetCooldown_post;
 	int HP_cmdline_init_pre;
 	int HP_cmdline_init_post;
 	int HP_cmdline_final_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index da93da520..8532f9d22 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -508,7 +508,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->mvp_exp, HP_clif_mvp_exp) },
 	{ HP_POP(clif->mvp_noitem, HP_clif_mvp_noitem) },
 	{ HP_POP(clif->changed_dir, HP_clif_changed_dir) },
-	{ HP_POP(clif->charnameack, HP_clif_charnameack) },
+	{ HP_POP(clif->blname_ack, HP_clif_blname_ack) },
 	{ HP_POP(clif->monster_hp_bar, HP_clif_monster_hp_bar) },
 	{ HP_POP(clif->hpmeter, HP_clif_hpmeter) },
 	{ HP_POP(clif->hpmeter_single, HP_clif_hpmeter_single) },
@@ -1146,6 +1146,11 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->pNPCBarterClosed, HP_clif_pNPCBarterClosed) },
 	{ HP_POP(clif->pNPCBarterPurchase, HP_clif_pNPCBarterPurchase) },
 	{ HP_POP(clif->pClientVersion, HP_clif_pClientVersion) },
+	{ HP_POP(clif->pPing, HP_clif_pPing) },
+	{ HP_POP(clif->ping, HP_clif_ping) },
+	{ HP_POP(clif->pingTimer, HP_clif_pingTimer) },
+	{ HP_POP(clif->pingTimerSub, HP_clif_pingTimerSub) },
+	{ HP_POP(clif->pResetCooldown, HP_clif_pResetCooldown) },
 /* cmdline_interface */
 	{ HP_POP(cmdline->init, HP_cmdline_init) },
 	{ HP_POP(cmdline->final, HP_cmdline_final) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 42ed2f96f..e6f8a69f0 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -12619,13 +12619,13 @@ void HP_clif_changed_dir(struct block_list *bl, enum send_target target) {
 	}
 	return;
 }
-void HP_clif_charnameack(int fd, struct block_list *bl) {
+void HP_clif_blname_ack(int fd, struct block_list *bl) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_charnameack_pre > 0) {
+	if (HPMHooks.count.HP_clif_blname_ack_pre > 0) {
 		void (*preHookFunc) (int *fd, struct block_list **bl);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_charnameack_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_charnameack_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_blname_ack_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_blname_ack_pre[hIndex].func;
 			preHookFunc(&fd, &bl);
 		}
 		if (*HPMforce_return) {
@@ -12634,12 +12634,12 @@ void HP_clif_charnameack(int fd, struct block_list *bl) {
 		}
 	}
 	{
-		HPMHooks.source.clif.charnameack(fd, bl);
+		HPMHooks.source.clif.blname_ack(fd, bl);
 	}
-	if (HPMHooks.count.HP_clif_charnameack_post > 0) {
+	if (HPMHooks.count.HP_clif_blname_ack_post > 0) {
 		void (*postHookFunc) (int fd, struct block_list *bl);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_charnameack_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_charnameack_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_blname_ack_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_blname_ack_post[hIndex].func;
 			postHookFunc(fd, bl);
 		}
 	}
@@ -29249,6 +29249,144 @@ void HP_clif_pClientVersion(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
+void HP_clif_pPing(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pPing_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPing_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pPing_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pPing(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pPing_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pPing_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pPing_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
+void HP_clif_ping(struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_ping_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ping_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_ping_pre[hIndex].func;
+			preHookFunc(&sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.ping(sd);
+	}
+	if (HPMHooks.count.HP_clif_ping_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_ping_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_ping_post[hIndex].func;
+			postHookFunc(sd);
+		}
+	}
+	return;
+}
+int HP_clif_pingTimer(int tid, int64 tick, int id, intptr_t data) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_clif_pingTimer_pre > 0) {
+		int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pingTimer_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pingTimer_pre[hIndex].func;
+			retVal___ = preHookFunc(&tid, &tick, &id, &data);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.clif.pingTimer(tid, tick, id, data);
+	}
+	if (HPMHooks.count.HP_clif_pingTimer_post > 0) {
+		int (*postHookFunc) (int retVal___, int tid, int64 tick, int id, intptr_t data);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pingTimer_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pingTimer_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, tid, tick, id, data);
+		}
+	}
+	return retVal___;
+}
+int HP_clif_pingTimerSub(struct map_session_data *sd, va_list ap) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_clif_pingTimerSub_pre > 0) {
+		int (*preHookFunc) (struct map_session_data **sd, va_list ap);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pingTimerSub_pre; hIndex++) {
+			va_list ap___copy; va_copy(ap___copy, ap);
+			preHookFunc = HPMHooks.list.HP_clif_pingTimerSub_pre[hIndex].func;
+			retVal___ = preHookFunc(&sd, ap___copy);
+			va_end(ap___copy);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		va_list ap___copy; va_copy(ap___copy, ap);
+		retVal___ = HPMHooks.source.clif.pingTimerSub(sd, ap___copy);
+		va_end(ap___copy);
+	}
+	if (HPMHooks.count.HP_clif_pingTimerSub_post > 0) {
+		int (*postHookFunc) (int retVal___, struct map_session_data *sd, va_list ap);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pingTimerSub_post; hIndex++) {
+			va_list ap___copy; va_copy(ap___copy, ap);
+			postHookFunc = HPMHooks.list.HP_clif_pingTimerSub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, sd, ap___copy);
+			va_end(ap___copy);
+		}
+	}
+	return retVal___;
+}
+void HP_clif_pResetCooldown(int fd, struct map_session_data *sd) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_clif_pResetCooldown_pre > 0) {
+		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pResetCooldown_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_pResetCooldown_pre[hIndex].func;
+			preHookFunc(&fd, &sd);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.clif.pResetCooldown(fd, sd);
+	}
+	if (HPMHooks.count.HP_clif_pResetCooldown_post > 0) {
+		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pResetCooldown_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_pResetCooldown_post[hIndex].func;
+			postHookFunc(fd, sd);
+		}
+	}
+	return;
+}
 /* cmdline_interface */
 void HP_cmdline_init(void) {
 	int hIndex = 0;