Merge pull request #1898 from Asheraf/homunaf

implement homunculus autofeeding for 2017 clients

4 files changed, 34 insertions, 34 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 3948221c8..4204be2e4 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1174,8 +1174,8 @@ typedef void (*HPMHOOK_pre_clif_feel_hate_reset) (struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_feel_hate_reset) (struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_partytickack) (struct map_session_data **sd, bool *flag);
 typedef void (*HPMHOOK_post_clif_partytickack) (struct map_session_data *sd, bool flag);
-typedef void (*HPMHOOK_pre_clif_equiptickack) (struct map_session_data **sd, int *flag);
-typedef void (*HPMHOOK_post_clif_equiptickack) (struct map_session_data *sd, int flag);
+typedef void (*HPMHOOK_pre_clif_zc_config) (struct map_session_data **sd, int *type, int *flag);
+typedef void (*HPMHOOK_post_clif_zc_config) (struct map_session_data *sd, int type, int flag);
 typedef void (*HPMHOOK_pre_clif_viewequip_ack) (struct map_session_data **sd, struct map_session_data **tsd);
 typedef void (*HPMHOOK_post_clif_viewequip_ack) (struct map_session_data *sd, struct map_session_data *tsd);
 typedef void (*HPMHOOK_pre_clif_equpcheckbox) (struct map_session_data **sd);
@@ -2132,8 +2132,8 @@ typedef void (*HPMHOOK_pre_clif_pAdopt_reply) (int *fd, struct map_session_data
 typedef void (*HPMHOOK_post_clif_pAdopt_reply) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pViewPlayerEquip) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pViewPlayerEquip) (int fd, struct map_session_data *sd);
-typedef void (*HPMHOOK_pre_clif_pEquipTick) (int *fd, struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_pEquipTick) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_p_cz_config) (int *fd, struct map_session_data **sd);
+typedef void (*HPMHOOK_post_clif_p_cz_config) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pquestStateAck) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pquestStateAck) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_pmercenary_action) (int *fd, struct map_session_data **sd);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 3f5d1096e..cc097aeae 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -810,8 +810,8 @@ struct {
 	struct HPMHookPoint *HP_clif_feel_hate_reset_post;
 	struct HPMHookPoint *HP_clif_partytickack_pre;
 	struct HPMHookPoint *HP_clif_partytickack_post;
-	struct HPMHookPoint *HP_clif_equiptickack_pre;
-	struct HPMHookPoint *HP_clif_equiptickack_post;
+	struct HPMHookPoint *HP_clif_zc_config_pre;
+	struct HPMHookPoint *HP_clif_zc_config_post;
 	struct HPMHookPoint *HP_clif_viewequip_ack_pre;
 	struct HPMHookPoint *HP_clif_viewequip_ack_post;
 	struct HPMHookPoint *HP_clif_equpcheckbox_pre;
@@ -1768,8 +1768,8 @@ struct {
 	struct HPMHookPoint *HP_clif_pAdopt_reply_post;
 	struct HPMHookPoint *HP_clif_pViewPlayerEquip_pre;
 	struct HPMHookPoint *HP_clif_pViewPlayerEquip_post;
-	struct HPMHookPoint *HP_clif_pEquipTick_pre;
-	struct HPMHookPoint *HP_clif_pEquipTick_post;
+	struct HPMHookPoint *HP_clif_p_cz_config_pre;
+	struct HPMHookPoint *HP_clif_p_cz_config_post;
 	struct HPMHookPoint *HP_clif_pquestStateAck_pre;
 	struct HPMHookPoint *HP_clif_pquestStateAck_post;
 	struct HPMHookPoint *HP_clif_pmercenary_action_pre;
@@ -7019,8 +7019,8 @@ struct {
 	int HP_clif_feel_hate_reset_post;
 	int HP_clif_partytickack_pre;
 	int HP_clif_partytickack_post;
-	int HP_clif_equiptickack_pre;
-	int HP_clif_equiptickack_post;
+	int HP_clif_zc_config_pre;
+	int HP_clif_zc_config_post;
 	int HP_clif_viewequip_ack_pre;
 	int HP_clif_viewequip_ack_post;
 	int HP_clif_equpcheckbox_pre;
@@ -7977,8 +7977,8 @@ struct {
 	int HP_clif_pAdopt_reply_post;
 	int HP_clif_pViewPlayerEquip_pre;
 	int HP_clif_pViewPlayerEquip_post;
-	int HP_clif_pEquipTick_pre;
-	int HP_clif_pEquipTick_post;
+	int HP_clif_p_cz_config_pre;
+	int HP_clif_p_cz_config_post;
 	int HP_clif_pquestStateAck_pre;
 	int HP_clif_pquestStateAck_post;
 	int HP_clif_pmercenary_action_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 7cc9086ba..7caf25de6 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -427,7 +427,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->mission_info, HP_clif_mission_info) },
 	{ HP_POP(clif->feel_hate_reset, HP_clif_feel_hate_reset) },
 	{ HP_POP(clif->partytickack, HP_clif_partytickack) },
-	{ HP_POP(clif->equiptickack, HP_clif_equiptickack) },
+	{ HP_POP(clif->zc_config, HP_clif_zc_config) },
 	{ HP_POP(clif->viewequip_ack, HP_clif_viewequip_ack) },
 	{ HP_POP(clif->equpcheckbox, HP_clif_equpcheckbox) },
 	{ HP_POP(clif->displayexp, HP_clif_displayexp) },
@@ -906,7 +906,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(clif->pAdopt_request, HP_clif_pAdopt_request) },
 	{ HP_POP(clif->pAdopt_reply, HP_clif_pAdopt_reply) },
 	{ HP_POP(clif->pViewPlayerEquip, HP_clif_pViewPlayerEquip) },
-	{ HP_POP(clif->pEquipTick, HP_clif_pEquipTick) },
+	{ HP_POP(clif->p_cz_config, HP_clif_p_cz_config) },
 	{ HP_POP(clif->pquestStateAck, HP_clif_pquestStateAck) },
 	{ HP_POP(clif->pmercenary_action, HP_clif_pmercenary_action) },
 	{ HP_POP(clif->pBattleChat, HP_clif_pBattleChat) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 9625d3e52..4340f8dbd 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -10524,14 +10524,14 @@ void HP_clif_partytickack(struct map_session_data *sd, bool flag) {
 	}
 	return;
 }
-void HP_clif_equiptickack(struct map_session_data *sd, int flag) {
+void HP_clif_zc_config(struct map_session_data *sd, int type, int flag) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_equiptickack_pre > 0) {
-		void (*preHookFunc) (struct map_session_data **sd, int *flag);
+	if (HPMHooks.count.HP_clif_zc_config_pre > 0) {
+		void (*preHookFunc) (struct map_session_data **sd, int *type, int *flag);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiptickack_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_equiptickack_pre[hIndex].func;
-			preHookFunc(&sd, &flag);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_zc_config_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_zc_config_pre[hIndex].func;
+			preHookFunc(&sd, &type, &flag);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -10539,13 +10539,13 @@ void HP_clif_equiptickack(struct map_session_data *sd, int flag) {
 		}
 	}
 	{
-		HPMHooks.source.clif.equiptickack(sd, flag);
+		HPMHooks.source.clif.zc_config(sd, type, flag);
 	}
-	if (HPMHooks.count.HP_clif_equiptickack_post > 0) {
-		void (*postHookFunc) (struct map_session_data *sd, int flag);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiptickack_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_equiptickack_post[hIndex].func;
-			postHookFunc(sd, flag);
+	if (HPMHooks.count.HP_clif_zc_config_post > 0) {
+		void (*postHookFunc) (struct map_session_data *sd, int type, int flag);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_zc_config_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_zc_config_post[hIndex].func;
+			postHookFunc(sd, type, flag);
 		}
 	}
 	return;
@@ -23005,13 +23005,13 @@ void HP_clif_pViewPlayerEquip(int fd, struct map_session_data *sd) {
 	}
 	return;
 }
-void HP_clif_pEquipTick(int fd, struct map_session_data *sd) {
+void HP_clif_p_cz_config(int fd, struct map_session_data *sd) {
 	int hIndex = 0;
-	if (HPMHooks.count.HP_clif_pEquipTick_pre > 0) {
+	if (HPMHooks.count.HP_clif_p_cz_config_pre > 0) {
 		void (*preHookFunc) (int *fd, struct map_session_data **sd);
 		*HPMforce_return = false;
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEquipTick_pre; hIndex++) {
-			preHookFunc = HPMHooks.list.HP_clif_pEquipTick_pre[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_p_cz_config_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_clif_p_cz_config_pre[hIndex].func;
 			preHookFunc(&fd, &sd);
 		}
 		if (*HPMforce_return) {
@@ -23020,12 +23020,12 @@ void HP_clif_pEquipTick(int fd, struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.pEquipTick(fd, sd);
+		HPMHooks.source.clif.p_cz_config(fd, sd);
 	}
-	if (HPMHooks.count.HP_clif_pEquipTick_post > 0) {
+	if (HPMHooks.count.HP_clif_p_cz_config_post > 0) {
 		void (*postHookFunc) (int fd, struct map_session_data *sd);
-		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEquipTick_post; hIndex++) {
-			postHookFunc = HPMHooks.list.HP_clif_pEquipTick_post[hIndex].func;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_p_cz_config_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_clif_p_cz_config_post[hIndex].func;
 			postHookFunc(fd, sd);
 		}
 	}