diff options
| author | Haru <haru@dotalux.com> | 2020-05-31 23:33:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-31 23:33:55 +0200 |
| commit | b3189b88eafd5a159780000845bacef79310a22c (patch) | |
| tree | 6abf9ca36ce7c703c2735589e7f89cef6e5f698a /src/plugins | |
| parent | 1cccfca3dd708354bf808068c1210ce353957f2e (diff) | |
| parent | 468c81a5367c444e2e678148d556df94eaa623af (diff) | |
| download | hercules-b3189b88eafd5a159780000845bacef79310a22c.tar.gz hercules-b3189b88eafd5a159780000845bacef79310a22c.tar.bz2 hercules-b3189b88eafd5a159780000845bacef79310a22c.tar.xz hercules-b3189b88eafd5a159780000845bacef79310a22c.zip | |
Merge pull request #2699 from Kenpachi2k13/multi_itemskill
Enable multiple itemskill() calls per item
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Defs.inc | 4 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc index 363727d46..107d0cc33 100644 --- a/src/plugins/HPMHooking/HPMHooking.Defs.inc +++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc @@ -6216,8 +6216,8 @@ typedef int (*HPMHOOK_pre_pc_checkitem) (struct map_session_data **sd); typedef int (*HPMHOOK_post_pc_checkitem) (int retVal___, struct map_session_data *sd); typedef int (*HPMHOOK_pre_pc_useitem) (struct map_session_data **sd, int *n); typedef int (*HPMHOOK_post_pc_useitem) (int retVal___, struct map_session_data *sd, int n); -typedef int (*HPMHOOK_pre_pc_autocast_clear) (struct map_session_data **sd); -typedef int (*HPMHOOK_post_pc_autocast_clear) (int retVal___, struct map_session_data *sd); +typedef void (*HPMHOOK_pre_pc_autocast_clear) (struct map_session_data **sd); +typedef void (*HPMHOOK_post_pc_autocast_clear) (struct map_session_data *sd); typedef int (*HPMHOOK_pre_pc_skillatk_bonus) (struct map_session_data **sd, uint16 *skill_id); typedef int (*HPMHOOK_post_pc_skillatk_bonus) (int retVal___, struct map_session_data *sd, uint16 skill_id); typedef int (*HPMHOOK_pre_pc_skillheal_bonus) (struct map_session_data **sd, uint16 *skill_id); diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index c1ee157af..97997f7b8 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -63781,32 +63781,31 @@ int HP_pc_useitem(struct map_session_data *sd, int n) { } return retVal___; } -int HP_pc_autocast_clear(struct map_session_data *sd) { +void HP_pc_autocast_clear(struct map_session_data *sd) { int hIndex = 0; - int retVal___ = 0; if (HPMHooks.count.HP_pc_autocast_clear_pre > 0) { - int (*preHookFunc) (struct map_session_data **sd); + void (*preHookFunc) (struct map_session_data **sd); *HPMforce_return = false; for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_autocast_clear_pre; hIndex++) { preHookFunc = HPMHooks.list.HP_pc_autocast_clear_pre[hIndex].func; - retVal___ = preHookFunc(&sd); + preHookFunc(&sd); } if (*HPMforce_return) { *HPMforce_return = false; - return retVal___; + return; } } { - retVal___ = HPMHooks.source.pc.autocast_clear(sd); + HPMHooks.source.pc.autocast_clear(sd); } if (HPMHooks.count.HP_pc_autocast_clear_post > 0) { - int (*postHookFunc) (int retVal___, struct map_session_data *sd); + void (*postHookFunc) (struct map_session_data *sd); for (hIndex = 0; hIndex < HPMHooks.count.HP_pc_autocast_clear_post; hIndex++) { postHookFunc = HPMHooks.list.HP_pc_autocast_clear_post[hIndex].func; - retVal___ = postHookFunc(retVal___, sd); + postHookFunc(sd); } } - return retVal___; + return; } int HP_pc_skillatk_bonus(struct map_session_data *sd, uint16 skill_id) { int hIndex = 0; |