Skip to content

Commit 8ef1277

Browse files
41444144
committed
Update HPM
1 parent 8767b53 commit 8ef1277

File tree

4 files changed

+96
-30
lines changed

4 files changed

+96
-30
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2088,8 +2088,10 @@ typedef void (*HPMHOOK_pre_clif_pLoadEndAck) (int *fd, struct map_session_data *
20882088
typedef void (*HPMHOOK_post_clif_pLoadEndAck) (int fd, struct map_session_data *sd);
20892089
typedef void (*HPMHOOK_pre_clif_pTickSend) (int *fd, struct map_session_data **sd);
20902090
typedef void (*HPMHOOK_post_clif_pTickSend) (int fd, struct map_session_data *sd);
2091-
typedef void (*HPMHOOK_pre_clif_pHotkey) (int *fd, struct map_session_data **sd);
2092-
typedef void (*HPMHOOK_post_clif_pHotkey) (int fd, struct map_session_data *sd);
2091+
typedef void (*HPMHOOK_pre_clif_pHotkey1) (int *fd, struct map_session_data **sd);
2092+
typedef void (*HPMHOOK_post_clif_pHotkey1) (int fd, struct map_session_data *sd);
2093+
typedef void (*HPMHOOK_pre_clif_pHotkey2) (int *fd, struct map_session_data **sd);
2094+
typedef void (*HPMHOOK_post_clif_pHotkey2) (int fd, struct map_session_data *sd);
20932095
typedef void (*HPMHOOK_pre_clif_pProgressbar) (int *fd, struct map_session_data **sd);
20942096
typedef void (*HPMHOOK_post_clif_pProgressbar) (int fd, struct map_session_data *sd);
20952097
typedef void (*HPMHOOK_pre_clif_pWalkToXY) (int *fd, struct map_session_data **sd);
@@ -2548,8 +2550,10 @@ typedef void (*HPMHOOK_pre_clif_pNPCMarketPurchase) (int *fd, struct map_session
25482550
typedef void (*HPMHOOK_post_clif_pNPCMarketPurchase) (int fd, struct map_session_data *sd);
25492551
typedef int (*HPMHOOK_pre_clif_add_item_options) (struct ItemOptions **buf, const struct item **it);
25502552
typedef int (*HPMHOOK_post_clif_add_item_options) (int retVal___, struct ItemOptions *buf, const struct item *it);
2551-
typedef void (*HPMHOOK_pre_clif_pHotkeyRowShift) (int *fd, struct map_session_data **sd);
2552-
typedef void (*HPMHOOK_post_clif_pHotkeyRowShift) (int fd, struct map_session_data *sd);
2553+
typedef void (*HPMHOOK_pre_clif_pHotkeyRowShift1) (int *fd, struct map_session_data **sd);
2554+
typedef void (*HPMHOOK_post_clif_pHotkeyRowShift1) (int fd, struct map_session_data *sd);
2555+
typedef void (*HPMHOOK_pre_clif_pHotkeyRowShift2) (int *fd, struct map_session_data **sd);
2556+
typedef void (*HPMHOOK_post_clif_pHotkeyRowShift2) (int fd, struct map_session_data *sd);
25532557
typedef void (*HPMHOOK_pre_clif_dressroom_open) (struct map_session_data **sd, int *view);
25542558
typedef void (*HPMHOOK_post_clif_dressroom_open) (struct map_session_data *sd, int view);
25552559
typedef void (*HPMHOOK_pre_clif_pOneClick_ItemIdentify) (int *fd, struct map_session_data **sd);

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,8 +1678,10 @@ struct {
16781678
struct HPMHookPoint *HP_clif_pLoadEndAck_post;
16791679
struct HPMHookPoint *HP_clif_pTickSend_pre;
16801680
struct HPMHookPoint *HP_clif_pTickSend_post;
1681-
struct HPMHookPoint *HP_clif_pHotkey_pre;
1682-
struct HPMHookPoint *HP_clif_pHotkey_post;
1681+
struct HPMHookPoint *HP_clif_pHotkey1_pre;
1682+
struct HPMHookPoint *HP_clif_pHotkey1_post;
1683+
struct HPMHookPoint *HP_clif_pHotkey2_pre;
1684+
struct HPMHookPoint *HP_clif_pHotkey2_post;
16831685
struct HPMHookPoint *HP_clif_pProgressbar_pre;
16841686
struct HPMHookPoint *HP_clif_pProgressbar_post;
16851687
struct HPMHookPoint *HP_clif_pWalkToXY_pre;
@@ -2138,8 +2140,10 @@ struct {
21382140
struct HPMHookPoint *HP_clif_pNPCMarketPurchase_post;
21392141
struct HPMHookPoint *HP_clif_add_item_options_pre;
21402142
struct HPMHookPoint *HP_clif_add_item_options_post;
2141-
struct HPMHookPoint *HP_clif_pHotkeyRowShift_pre;
2142-
struct HPMHookPoint *HP_clif_pHotkeyRowShift_post;
2143+
struct HPMHookPoint *HP_clif_pHotkeyRowShift1_pre;
2144+
struct HPMHookPoint *HP_clif_pHotkeyRowShift1_post;
2145+
struct HPMHookPoint *HP_clif_pHotkeyRowShift2_pre;
2146+
struct HPMHookPoint *HP_clif_pHotkeyRowShift2_post;
21432147
struct HPMHookPoint *HP_clif_dressroom_open_pre;
21442148
struct HPMHookPoint *HP_clif_dressroom_open_post;
21452149
struct HPMHookPoint *HP_clif_pOneClick_ItemIdentify_pre;
@@ -8461,8 +8465,10 @@ struct {
84618465
int HP_clif_pLoadEndAck_post;
84628466
int HP_clif_pTickSend_pre;
84638467
int HP_clif_pTickSend_post;
8464-
int HP_clif_pHotkey_pre;
8465-
int HP_clif_pHotkey_post;
8468+
int HP_clif_pHotkey1_pre;
8469+
int HP_clif_pHotkey1_post;
8470+
int HP_clif_pHotkey2_pre;
8471+
int HP_clif_pHotkey2_post;
84668472
int HP_clif_pProgressbar_pre;
84678473
int HP_clif_pProgressbar_post;
84688474
int HP_clif_pWalkToXY_pre;
@@ -8921,8 +8927,10 @@ struct {
89218927
int HP_clif_pNPCMarketPurchase_post;
89228928
int HP_clif_add_item_options_pre;
89238929
int HP_clif_add_item_options_post;
8924-
int HP_clif_pHotkeyRowShift_pre;
8925-
int HP_clif_pHotkeyRowShift_post;
8930+
int HP_clif_pHotkeyRowShift1_pre;
8931+
int HP_clif_pHotkeyRowShift1_post;
8932+
int HP_clif_pHotkeyRowShift2_pre;
8933+
int HP_clif_pHotkeyRowShift2_post;
89268934
int HP_clif_dressroom_open_pre;
89278935
int HP_clif_dressroom_open_post;
89288936
int HP_clif_pOneClick_ItemIdentify_pre;

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,8 @@ struct HookingPointData HookingPoints[] = {
863863
{ HP_POP(clif->pWantToConnection, HP_clif_pWantToConnection) },
864864
{ HP_POP(clif->pLoadEndAck, HP_clif_pLoadEndAck) },
865865
{ HP_POP(clif->pTickSend, HP_clif_pTickSend) },
866-
{ HP_POP(clif->pHotkey, HP_clif_pHotkey) },
866+
{ HP_POP(clif->pHotkey1, HP_clif_pHotkey1) },
867+
{ HP_POP(clif->pHotkey2, HP_clif_pHotkey2) },
867868
{ HP_POP(clif->pProgressbar, HP_clif_pProgressbar) },
868869
{ HP_POP(clif->pWalkToXY, HP_clif_pWalkToXY) },
869870
{ HP_POP(clif->pQuitGame, HP_clif_pQuitGame) },
@@ -1093,7 +1094,8 @@ struct HookingPointData HookingPoints[] = {
10931094
{ HP_POP(clif->pNPCMarketClosed, HP_clif_pNPCMarketClosed) },
10941095
{ HP_POP(clif->pNPCMarketPurchase, HP_clif_pNPCMarketPurchase) },
10951096
{ HP_POP(clif->add_item_options, HP_clif_add_item_options) },
1096-
{ HP_POP(clif->pHotkeyRowShift, HP_clif_pHotkeyRowShift) },
1097+
{ HP_POP(clif->pHotkeyRowShift1, HP_clif_pHotkeyRowShift1) },
1098+
{ HP_POP(clif->pHotkeyRowShift2, HP_clif_pHotkeyRowShift2) },
10971099
{ HP_POP(clif->dressroom_open, HP_clif_dressroom_open) },
10981100
{ HP_POP(clif->pOneClick_ItemIdentify, HP_clif_pOneClick_ItemIdentify) },
10991101
{ HP_POP(clif->selectcart, HP_clif_selectcart) },

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

Lines changed: 68 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21884,13 +21884,13 @@ void HP_clif_pTickSend(int fd, struct map_session_data *sd) {
2188421884
}
2188521885
return;
2188621886
}
21887-
void HP_clif_pHotkey(int fd, struct map_session_data *sd) {
21887+
void HP_clif_pHotkey1(int fd, struct map_session_data *sd) {
2188821888
int hIndex = 0;
21889-
if (HPMHooks.count.HP_clif_pHotkey_pre > 0) {
21889+
if (HPMHooks.count.HP_clif_pHotkey1_pre > 0) {
2189021890
void (*preHookFunc) (int *fd, struct map_session_data **sd);
2189121891
*HPMforce_return = false;
21892-
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey_pre; hIndex++) {
21893-
preHookFunc = HPMHooks.list.HP_clif_pHotkey_pre[hIndex].func;
21892+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey1_pre; hIndex++) {
21893+
preHookFunc = HPMHooks.list.HP_clif_pHotkey1_pre[hIndex].func;
2189421894
preHookFunc(&fd, &sd);
2189521895
}
2189621896
if (*HPMforce_return) {
@@ -21899,12 +21899,38 @@ void HP_clif_pHotkey(int fd, struct map_session_data *sd) {
2189921899
}
2190021900
}
2190121901
{
21902-
HPMHooks.source.clif.pHotkey(fd, sd);
21902+
HPMHooks.source.clif.pHotkey1(fd, sd);
2190321903
}
21904-
if (HPMHooks.count.HP_clif_pHotkey_post > 0) {
21904+
if (HPMHooks.count.HP_clif_pHotkey1_post > 0) {
2190521905
void (*postHookFunc) (int fd, struct map_session_data *sd);
21906-
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey_post; hIndex++) {
21907-
postHookFunc = HPMHooks.list.HP_clif_pHotkey_post[hIndex].func;
21906+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey1_post; hIndex++) {
21907+
postHookFunc = HPMHooks.list.HP_clif_pHotkey1_post[hIndex].func;
21908+
postHookFunc(fd, sd);
21909+
}
21910+
}
21911+
return;
21912+
}
21913+
void HP_clif_pHotkey2(int fd, struct map_session_data *sd) {
21914+
int hIndex = 0;
21915+
if (HPMHooks.count.HP_clif_pHotkey2_pre > 0) {
21916+
void (*preHookFunc) (int *fd, struct map_session_data **sd);
21917+
*HPMforce_return = false;
21918+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey2_pre; hIndex++) {
21919+
preHookFunc = HPMHooks.list.HP_clif_pHotkey2_pre[hIndex].func;
21920+
preHookFunc(&fd, &sd);
21921+
}
21922+
if (*HPMforce_return) {
21923+
*HPMforce_return = false;
21924+
return;
21925+
}
21926+
}
21927+
{
21928+
HPMHooks.source.clif.pHotkey2(fd, sd);
21929+
}
21930+
if (HPMHooks.count.HP_clif_pHotkey2_post > 0) {
21931+
void (*postHookFunc) (int fd, struct map_session_data *sd);
21932+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkey2_post; hIndex++) {
21933+
postHookFunc = HPMHooks.list.HP_clif_pHotkey2_post[hIndex].func;
2190821934
postHookFunc(fd, sd);
2190921935
}
2191021936
}
@@ -27865,13 +27891,39 @@ int HP_clif_add_item_options(struct ItemOptions *buf, const struct item *it) {
2786527891
}
2786627892
return retVal___;
2786727893
}
27868-
void HP_clif_pHotkeyRowShift(int fd, struct map_session_data *sd) {
27894+
void HP_clif_pHotkeyRowShift1(int fd, struct map_session_data *sd) {
27895+
int hIndex = 0;
27896+
if (HPMHooks.count.HP_clif_pHotkeyRowShift1_pre > 0) {
27897+
void (*preHookFunc) (int *fd, struct map_session_data **sd);
27898+
*HPMforce_return = false;
27899+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift1_pre; hIndex++) {
27900+
preHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift1_pre[hIndex].func;
27901+
preHookFunc(&fd, &sd);
27902+
}
27903+
if (*HPMforce_return) {
27904+
*HPMforce_return = false;
27905+
return;
27906+
}
27907+
}
27908+
{
27909+
HPMHooks.source.clif.pHotkeyRowShift1(fd, sd);
27910+
}
27911+
if (HPMHooks.count.HP_clif_pHotkeyRowShift1_post > 0) {
27912+
void (*postHookFunc) (int fd, struct map_session_data *sd);
27913+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift1_post; hIndex++) {
27914+
postHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift1_post[hIndex].func;
27915+
postHookFunc(fd, sd);
27916+
}
27917+
}
27918+
return;
27919+
}
27920+
void HP_clif_pHotkeyRowShift2(int fd, struct map_session_data *sd) {
2786927921
int hIndex = 0;
27870-
if (HPMHooks.count.HP_clif_pHotkeyRowShift_pre > 0) {
27922+
if (HPMHooks.count.HP_clif_pHotkeyRowShift2_pre > 0) {
2787127923
void (*preHookFunc) (int *fd, struct map_session_data **sd);
2787227924
*HPMforce_return = false;
27873-
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift_pre; hIndex++) {
27874-
preHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift_pre[hIndex].func;
27925+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift2_pre; hIndex++) {
27926+
preHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift2_pre[hIndex].func;
2787527927
preHookFunc(&fd, &sd);
2787627928
}
2787727929
if (*HPMforce_return) {
@@ -27880,12 +27932,12 @@ void HP_clif_pHotkeyRowShift(int fd, struct map_session_data *sd) {
2788027932
}
2788127933
}
2788227934
{
27883-
HPMHooks.source.clif.pHotkeyRowShift(fd, sd);
27935+
HPMHooks.source.clif.pHotkeyRowShift2(fd, sd);
2788427936
}
27885-
if (HPMHooks.count.HP_clif_pHotkeyRowShift_post > 0) {
27937+
if (HPMHooks.count.HP_clif_pHotkeyRowShift2_post > 0) {
2788627938
void (*postHookFunc) (int fd, struct map_session_data *sd);
27887-
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift_post; hIndex++) {
27888-
postHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift_post[hIndex].func;
27939+
for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_pHotkeyRowShift2_post; hIndex++) {
27940+
postHookFunc = HPMHooks.list.HP_clif_pHotkeyRowShift2_post[hIndex].func;
2788927941
postHookFunc(fd, sd);
2789027942
}
2789127943
}

0 commit comments

Comments
 (0)