Skip to content

Commit e38cb92

Browse files
AsherafAsheraf
committed
HPM Hooks Update
1 parent ef575f9 commit e38cb92

File tree

4 files changed

+34
-34
lines changed

4 files changed

+34
-34
lines changed

‎src/plugins/HPMHooking/HPMHooking.Defs.inc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,8 @@ typedef void (*HPMHOOK_pre_clif_feel_hate_reset) (struct map_session_data **sd);
11741174
typedef void (*HPMHOOK_post_clif_feel_hate_reset) (struct map_session_data *sd);
11751175
typedef void (*HPMHOOK_pre_clif_partytickack) (struct map_session_data **sd, bool *flag);
11761176
typedef void (*HPMHOOK_post_clif_partytickack) (struct map_session_data *sd, bool flag);
1177-
typedef void (*HPMHOOK_pre_clif_equiptickack) (struct map_session_data **sd, int *flag);
1178-
typedef void (*HPMHOOK_post_clif_equiptickack) (struct map_session_data *sd, int flag);
1177+
typedef void (*HPMHOOK_pre_clif_zc_config) (struct map_session_data **sd, int *type, int *flag);
1178+
typedef void (*HPMHOOK_post_clif_zc_config) (struct map_session_data *sd, int type, int flag);
11791179
typedef void (*HPMHOOK_pre_clif_viewequip_ack) (struct map_session_data **sd, struct map_session_data **tsd);
11801180
typedef void (*HPMHOOK_post_clif_viewequip_ack) (struct map_session_data *sd, struct map_session_data *tsd);
11811181
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
21322132
typedef void (*HPMHOOK_post_clif_pAdopt_reply) (int fd, struct map_session_data *sd);
21332133
typedef void (*HPMHOOK_pre_clif_pViewPlayerEquip) (int *fd, struct map_session_data **sd);
21342134
typedef void (*HPMHOOK_post_clif_pViewPlayerEquip) (int fd, struct map_session_data *sd);
2135-
typedef void (*HPMHOOK_pre_clif_pEquipTick) (int *fd, struct map_session_data **sd);
2136-
typedef void (*HPMHOOK_post_clif_pEquipTick) (int fd, struct map_session_data *sd);
2135+
typedef void (*HPMHOOK_pre_clif_p_cz_config) (int *fd, struct map_session_data **sd);
2136+
typedef void (*HPMHOOK_post_clif_p_cz_config) (int fd, struct map_session_data *sd);
21372137
typedef void (*HPMHOOK_pre_clif_pquestStateAck) (int *fd, struct map_session_data **sd);
21382138
typedef void (*HPMHOOK_post_clif_pquestStateAck) (int fd, struct map_session_data *sd);
21392139
typedef void (*HPMHOOK_pre_clif_pmercenary_action) (int *fd, struct map_session_data **sd);

‎src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -810,8 +810,8 @@ struct {
810810
struct HPMHookPoint *HP_clif_feel_hate_reset_post;
811811
struct HPMHookPoint *HP_clif_partytickack_pre;
812812
struct HPMHookPoint *HP_clif_partytickack_post;
813-
struct HPMHookPoint *HP_clif_equiptickack_pre;
814-
struct HPMHookPoint *HP_clif_equiptickack_post;
813+
struct HPMHookPoint *HP_clif_zc_config_pre;
814+
struct HPMHookPoint *HP_clif_zc_config_post;
815815
struct HPMHookPoint *HP_clif_viewequip_ack_pre;
816816
struct HPMHookPoint *HP_clif_viewequip_ack_post;
817817
struct HPMHookPoint *HP_clif_equpcheckbox_pre;
@@ -1768,8 +1768,8 @@ struct {
17681768
struct HPMHookPoint *HP_clif_pAdopt_reply_post;
17691769
struct HPMHookPoint *HP_clif_pViewPlayerEquip_pre;
17701770
struct HPMHookPoint *HP_clif_pViewPlayerEquip_post;
1771-
struct HPMHookPoint *HP_clif_pEquipTick_pre;
1772-
struct HPMHookPoint *HP_clif_pEquipTick_post;
1771+
struct HPMHookPoint *HP_clif_p_cz_config_pre;
1772+
struct HPMHookPoint *HP_clif_p_cz_config_post;
17731773
struct HPMHookPoint *HP_clif_pquestStateAck_pre;
17741774
struct HPMHookPoint *HP_clif_pquestStateAck_post;
17751775
struct HPMHookPoint *HP_clif_pmercenary_action_pre;
@@ -7009,8 +7009,8 @@ struct {
70097009
int HP_clif_feel_hate_reset_post;
70107010
int HP_clif_partytickack_pre;
70117011
int HP_clif_partytickack_post;
7012-
int HP_clif_equiptickack_pre;
7013-
int HP_clif_equiptickack_post;
7012+
int HP_clif_zc_config_pre;
7013+
int HP_clif_zc_config_post;
70147014
int HP_clif_viewequip_ack_pre;
70157015
int HP_clif_viewequip_ack_post;
70167016
int HP_clif_equpcheckbox_pre;
@@ -7967,8 +7967,8 @@ struct {
79677967
int HP_clif_pAdopt_reply_post;
79687968
int HP_clif_pViewPlayerEquip_pre;
79697969
int HP_clif_pViewPlayerEquip_post;
7970-
int HP_clif_pEquipTick_pre;
7971-
int HP_clif_pEquipTick_post;
7970+
int HP_clif_p_cz_config_pre;
7971+
int HP_clif_p_cz_config_post;
79727972
int HP_clif_pquestStateAck_pre;
79737973
int HP_clif_pquestStateAck_post;
79747974
int HP_clif_pmercenary_action_pre;

‎src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ struct HookingPointData HookingPoints[] = {
427427
{ HP_POP(clif->mission_info, HP_clif_mission_info) },
428428
{ HP_POP(clif->feel_hate_reset, HP_clif_feel_hate_reset) },
429429
{ HP_POP(clif->partytickack, HP_clif_partytickack) },
430-
{ HP_POP(clif->equiptickack, HP_clif_equiptickack) },
430+
{ HP_POP(clif->zc_config, HP_clif_zc_config) },
431431
{ HP_POP(clif->viewequip_ack, HP_clif_viewequip_ack) },
432432
{ HP_POP(clif->equpcheckbox, HP_clif_equpcheckbox) },
433433
{ HP_POP(clif->displayexp, HP_clif_displayexp) },
@@ -906,7 +906,7 @@ struct HookingPointData HookingPoints[] = {
906906
{ HP_POP(clif->pAdopt_request, HP_clif_pAdopt_request) },
907907
{ HP_POP(clif->pAdopt_reply, HP_clif_pAdopt_reply) },
908908
{ HP_POP(clif->pViewPlayerEquip, HP_clif_pViewPlayerEquip) },
909-
{ HP_POP(clif->pEquipTick, HP_clif_pEquipTick) },
909+
{ HP_POP(clif->p_cz_config, HP_clif_p_cz_config) },
910910
{ HP_POP(clif->pquestStateAck, HP_clif_pquestStateAck) },
911911
{ HP_POP(clif->pmercenary_action, HP_clif_pmercenary_action) },
912912
{ HP_POP(clif->pBattleChat, HP_clif_pBattleChat) },

‎src/plugins/HPMHooking/HPMHooking_map.Hooks.inc‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10524,28 +10524,28 @@ void HP_clif_partytickack(struct map_session_data *sd, bool flag) {
1052410524
}
1052510525
return;
1052610526
}
10527-
void HP_clif_equiptickack(struct map_session_data *sd, int flag) {
10527+
void HP_clif_zc_config(struct map_session_data *sd, int type, int flag) {
1052810528
int hIndex = 0;
10529-
if (HPMHooks.count.HP_clif_equiptickack_pre > 0) {
10530-
void (*preHookFunc) (struct map_session_data **sd, int *flag);
10529+
if (HPMHooks.count.HP_clif_zc_config_pre > 0) {
10530+
void (*preHookFunc) (struct map_session_data **sd, int *type, int *flag);
1053110531
*HPMforce_return = false;
10532-
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiptickack_pre; hIndex++) {
10533-
preHookFunc = HPMHooks.list.HP_clif_equiptickack_pre[hIndex].func;
10534-
preHookFunc(&sd, &flag);
10532+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_zc_config_pre; hIndex++) {
10533+
preHookFunc = HPMHooks.list.HP_clif_zc_config_pre[hIndex].func;
10534+
preHookFunc(&sd, &type, &flag);
1053510535
}
1053610536
if (*HPMforce_return) {
1053710537
*HPMforce_return = false;
1053810538
return;
1053910539
}
1054010540
}
1054110541
{
10542-
HPMHooks.source.clif.equiptickack(sd, flag);
10542+
HPMHooks.source.clif.zc_config(sd, type, flag);
1054310543
}
10544-
if (HPMHooks.count.HP_clif_equiptickack_post > 0) {
10545-
void (*postHookFunc) (struct map_session_data *sd, int flag);
10546-
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_equiptickack_post; hIndex++) {
10547-
postHookFunc = HPMHooks.list.HP_clif_equiptickack_post[hIndex].func;
10548-
postHookFunc(sd, flag);
10544+
if (HPMHooks.count.HP_clif_zc_config_post > 0) {
10545+
void (*postHookFunc) (struct map_session_data *sd, int type, int flag);
10546+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_zc_config_post; hIndex++) {
10547+
postHookFunc = HPMHooks.list.HP_clif_zc_config_post[hIndex].func;
10548+
postHookFunc(sd, type, flag);
1054910549
}
1055010550
}
1055110551
return;
@@ -23005,13 +23005,13 @@ void HP_clif_pViewPlayerEquip(int fd, struct map_session_data *sd) {
2300523005
}
2300623006
return;
2300723007
}
23008-
void HP_clif_pEquipTick(int fd, struct map_session_data *sd) {
23008+
void HP_clif_p_cz_config(int fd, struct map_session_data *sd) {
2300923009
int hIndex = 0;
23010-
if (HPMHooks.count.HP_clif_pEquipTick_pre > 0) {
23010+
if (HPMHooks.count.HP_clif_p_cz_config_pre > 0) {
2301123011
void (*preHookFunc) (int *fd, struct map_session_data **sd);
2301223012
*HPMforce_return = false;
23013-
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEquipTick_pre; hIndex++) {
23014-
preHookFunc = HPMHooks.list.HP_clif_pEquipTick_pre[hIndex].func;
23013+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_p_cz_config_pre; hIndex++) {
23014+
preHookFunc = HPMHooks.list.HP_clif_p_cz_config_pre[hIndex].func;
2301523015
preHookFunc(&fd, &sd);
2301623016
}
2301723017
if (*HPMforce_return) {
@@ -23020,12 +23020,12 @@ void HP_clif_pEquipTick(int fd, struct map_session_data *sd) {
2302023020
}
2302123021
}
2302223022
{
23023-
HPMHooks.source.clif.pEquipTick(fd, sd);
23023+
HPMHooks.source.clif.p_cz_config(fd, sd);
2302423024
}
23025-
if (HPMHooks.count.HP_clif_pEquipTick_post > 0) {
23025+
if (HPMHooks.count.HP_clif_p_cz_config_post > 0) {
2302623026
void (*postHookFunc) (int fd, struct map_session_data *sd);
23027-
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pEquipTick_post; hIndex++) {
23028-
postHookFunc = HPMHooks.list.HP_clif_pEquipTick_post[hIndex].func;
23027+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_p_cz_config_post; hIndex++) {
23028+
postHookFunc = HPMHooks.list.HP_clif_p_cz_config_post[hIndex].func;
2302923029
postHookFunc(fd, sd);
2303023030
}
2303123031
}

0 commit comments

Comments
 (0)