summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHercules.ws <dev@herc.ws>2016-07-13 23:54:09 +0200
committerHerculesWSAPI <dev@herc.ws>2016-07-13 23:54:09 +0200
commitdc32fdce0284cc3ad9a6eb17fb98c58334453678 (patch)
treeae1f53c34393f2abd1e1edca04eefb080c5dd0d0
parent2f8399e6f7d75e67717daa747908b8d38c1e805b (diff)
downloadhercules-dc32fdce0284cc3ad9a6eb17fb98c58334453678.tar.gz
hercules-dc32fdce0284cc3ad9a6eb17fb98c58334453678.tar.bz2
hercules-dc32fdce0284cc3ad9a6eb17fb98c58334453678.tar.xz
hercules-dc32fdce0284cc3ad9a6eb17fb98c58334453678.zip
HPM Hooks Update
Signed-off-by: HerculesWSAPI <dev@herc.ws>
-rw-r--r--src/plugins/HPMHooking/HPMHooking.Defs.inc4
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc8
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc2
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.Hooks.inc24
4 files changed, 19 insertions, 19 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 756c849fd..e667176b8 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -1236,8 +1236,8 @@ typedef void (*HPMHOOK_pre_clif_skill_estimation) (struct map_session_data **sd,
typedef void (*HPMHOOK_post_clif_skill_estimation) (struct map_session_data *sd, struct block_list *dst);
typedef void (*HPMHOOK_pre_clif_skill_warppoint) (struct map_session_data **sd, uint16 *skill_id, uint16 *skill_lv, unsigned short *map1, unsigned short *map2, unsigned short *map3, unsigned short *map4);
typedef void (*HPMHOOK_post_clif_skill_warppoint) (struct map_session_data *sd, uint16 skill_id, uint16 skill_lv, unsigned short map1, unsigned short map2, unsigned short map3, unsigned short map4);
-typedef void (*HPMHOOK_pre_clif_skillcasting) (struct block_list **bl, int *src_id, int *dst_id, int *dst_x, int *dst_y, uint16 *skill_id, int *property, int *casttime);
-typedef void (*HPMHOOK_post_clif_skillcasting) (struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, int property, int casttime);
+typedef void (*HPMHOOK_pre_clif_useskill) (struct block_list **bl, int *src_id, int *dst_id, int *dst_x, int *dst_y, uint16 *skill_id, uint16 *skill_lv, int *casttime);
+typedef void (*HPMHOOK_post_clif_useskill) (struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, uint16 skill_lv, int casttime);
typedef void (*HPMHOOK_pre_clif_produce_effect) (struct map_session_data **sd, int *flag, int *nameid);
typedef void (*HPMHOOK_post_clif_produce_effect) (struct map_session_data *sd, int flag, int nameid);
typedef void (*HPMHOOK_pre_clif_devotion) (struct block_list **src, struct map_session_data **tsd);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 82123c633..06c4acc50 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -902,8 +902,8 @@ struct {
struct HPMHookPoint *HP_clif_skill_estimation_post;
struct HPMHookPoint *HP_clif_skill_warppoint_pre;
struct HPMHookPoint *HP_clif_skill_warppoint_post;
- struct HPMHookPoint *HP_clif_skillcasting_pre;
- struct HPMHookPoint *HP_clif_skillcasting_post;
+ struct HPMHookPoint *HP_clif_useskill_pre;
+ struct HPMHookPoint *HP_clif_useskill_post;
struct HPMHookPoint *HP_clif_produce_effect_pre;
struct HPMHookPoint *HP_clif_produce_effect_post;
struct HPMHookPoint *HP_clif_devotion_pre;
@@ -6953,8 +6953,8 @@ struct {
int HP_clif_skill_estimation_post;
int HP_clif_skill_warppoint_pre;
int HP_clif_skill_warppoint_post;
- int HP_clif_skillcasting_pre;
- int HP_clif_skillcasting_post;
+ int HP_clif_useskill_pre;
+ int HP_clif_useskill_post;
int HP_clif_produce_effect_pre;
int HP_clif_produce_effect_post;
int HP_clif_devotion_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index f03cd3c37..2cef7f135 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -473,7 +473,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(clif->skill_poseffect, HP_clif_skill_poseffect) },
{ HP_POP(clif->skill_estimation, HP_clif_skill_estimation) },
{ HP_POP(clif->skill_warppoint, HP_clif_skill_warppoint) },
- { HP_POP(clif->skillcasting, HP_clif_skillcasting) },
+ { HP_POP(clif->useskill, HP_clif_useskill) },
{ HP_POP(clif->produce_effect, HP_clif_produce_effect) },
{ HP_POP(clif->devotion, HP_clif_devotion) },
{ HP_POP(clif->spiritball, HP_clif_spiritball) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index a948733f0..5f6c018cd 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -11728,14 +11728,14 @@ void HP_clif_skill_warppoint(struct map_session_data *sd, uint16 skill_id, uint1
}
return;
}
-void HP_clif_skillcasting(struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, int property, int casttime) {
+void HP_clif_useskill(struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, uint16 skill_lv, int casttime) {
int hIndex = 0;
- if( HPMHooks.count.HP_clif_skillcasting_pre ) {
- void (*preHookFunc) (struct block_list **bl, int *src_id, int *dst_id, int *dst_x, int *dst_y, uint16 *skill_id, int *property, int *casttime);
+ if( HPMHooks.count.HP_clif_useskill_pre ) {
+ void (*preHookFunc) (struct block_list **bl, int *src_id, int *dst_id, int *dst_x, int *dst_y, uint16 *skill_id, uint16 *skill_lv, int *casttime);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillcasting_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_clif_skillcasting_pre[hIndex].func;
- preHookFunc(&bl, &src_id, &dst_id, &dst_x, &dst_y, &skill_id, &property, &casttime);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_useskill_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_clif_useskill_pre[hIndex].func;
+ preHookFunc(&bl, &src_id, &dst_id, &dst_x, &dst_y, &skill_id, &skill_lv, &casttime);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -11743,13 +11743,13 @@ void HP_clif_skillcasting(struct block_list *bl, int src_id, int dst_id, int dst
}
}
{
- HPMHooks.source.clif.skillcasting(bl, src_id, dst_id, dst_x, dst_y, skill_id, property, casttime);
+ HPMHooks.source.clif.useskill(bl, src_id, dst_id, dst_x, dst_y, skill_id, skill_lv, casttime);
}
- if( HPMHooks.count.HP_clif_skillcasting_post ) {
- void (*postHookFunc) (struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, int property, int casttime);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_skillcasting_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_clif_skillcasting_post[hIndex].func;
- postHookFunc(bl, src_id, dst_id, dst_x, dst_y, skill_id, property, casttime);
+ if( HPMHooks.count.HP_clif_useskill_post ) {
+ void (*postHookFunc) (struct block_list *bl, int src_id, int dst_id, int dst_x, int dst_y, uint16 skill_id, uint16 skill_lv, int casttime);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_useskill_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_clif_useskill_post[hIndex].func;
+ postHookFunc(bl, src_id, dst_id, dst_x, dst_y, skill_id, skill_lv, casttime);
}
}
return;