diff options
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc | 32 | ||||
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc | 8 | ||||
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 224 |
3 files changed, 226 insertions, 38 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index 6e982bb70..74e765cee 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -423,6 +423,8 @@ struct { struct HPMHookPoint *HP_clif_send_post; struct HPMHookPoint *HP_clif_send_sub_pre; struct HPMHookPoint *HP_clif_send_sub_post; + struct HPMHookPoint *HP_clif_send_actual_pre; + struct HPMHookPoint *HP_clif_send_actual_post; struct HPMHookPoint *HP_clif_parse_pre; struct HPMHookPoint *HP_clif_parse_post; struct HPMHookPoint *HP_clif_parse_cmd_pre; @@ -505,6 +507,8 @@ struct { struct HPMHookPoint *HP_clif_changetraplook_post; struct HPMHookPoint *HP_clif_refreshlook_pre; struct HPMHookPoint *HP_clif_refreshlook_post; + struct HPMHookPoint *HP_clif_sendlook_pre; + struct HPMHookPoint *HP_clif_sendlook_post; struct HPMHookPoint *HP_clif_class_change_pre; struct HPMHookPoint *HP_clif_class_change_post; struct HPMHookPoint *HP_clif_skill_delunit_pre; @@ -3301,12 +3305,16 @@ struct { struct HPMHookPoint *HP_npc_parseview_post; struct HPMHookPoint *HP_npc_viewisid_pre; struct HPMHookPoint *HP_npc_viewisid_post; + struct HPMHookPoint *HP_npc_create_npc_pre; + struct HPMHookPoint *HP_npc_create_npc_post; struct HPMHookPoint *HP_npc_add_warp_pre; struct HPMHookPoint *HP_npc_add_warp_post; struct HPMHookPoint *HP_npc_parse_warp_pre; struct HPMHookPoint *HP_npc_parse_warp_post; struct HPMHookPoint *HP_npc_parse_shop_pre; struct HPMHookPoint *HP_npc_parse_shop_post; + struct HPMHookPoint *HP_npc_parse_unknown_object_pre; + struct HPMHookPoint *HP_npc_parse_unknown_object_post; struct HPMHookPoint *HP_npc_convertlabel_db_pre; struct HPMHookPoint *HP_npc_convertlabel_db_post; struct HPMHookPoint *HP_npc_skip_script_pre; @@ -3339,6 +3347,8 @@ struct { struct HPMHookPoint *HP_npc_parse_mob_post; struct HPMHookPoint *HP_npc_parse_mapflag_pre; struct HPMHookPoint *HP_npc_parse_mapflag_post; + struct HPMHookPoint *HP_npc_parse_unknown_mapflag_pre; + struct HPMHookPoint *HP_npc_parse_unknown_mapflag_post; struct HPMHookPoint *HP_npc_parsesrcfile_pre; struct HPMHookPoint *HP_npc_parsesrcfile_post; struct HPMHookPoint *HP_npc_script_event_pre; @@ -3691,8 +3701,12 @@ struct { struct HPMHookPoint *HP_pc_resethate_post; struct HPMHookPoint *HP_pc_equipitem_pre; struct HPMHookPoint *HP_pc_equipitem_post; + struct HPMHookPoint *HP_pc_equipitem_pos_pre; + struct HPMHookPoint *HP_pc_equipitem_pos_post; struct HPMHookPoint *HP_pc_unequipitem_pre; struct HPMHookPoint *HP_pc_unequipitem_post; + struct HPMHookPoint *HP_pc_unequipitem_pos_pre; + struct HPMHookPoint *HP_pc_unequipitem_pos_post; struct HPMHookPoint *HP_pc_checkitem_pre; struct HPMHookPoint *HP_pc_checkitem_post; struct HPMHookPoint *HP_pc_useitem_pre; @@ -3995,8 +4009,6 @@ struct { struct HPMHookPoint *HP_pet_skill_bonus_timer_post; struct HPMHookPoint *HP_pet_recovery_timer_pre; struct HPMHookPoint *HP_pet_recovery_timer_post; - struct HPMHookPoint *HP_pet_heal_timer_pre; - struct HPMHookPoint *HP_pet_heal_timer_post; struct HPMHookPoint *HP_pet_skill_support_timer_pre; struct HPMHookPoint *HP_pet_skill_support_timer_post; struct HPMHookPoint *HP_pet_read_db_pre; @@ -5482,6 +5494,8 @@ struct { int HP_clif_send_post; int HP_clif_send_sub_pre; int HP_clif_send_sub_post; + int HP_clif_send_actual_pre; + int HP_clif_send_actual_post; int HP_clif_parse_pre; int HP_clif_parse_post; int HP_clif_parse_cmd_pre; @@ -5564,6 +5578,8 @@ struct { int HP_clif_changetraplook_post; int HP_clif_refreshlook_pre; int HP_clif_refreshlook_post; + int HP_clif_sendlook_pre; + int HP_clif_sendlook_post; int HP_clif_class_change_pre; int HP_clif_class_change_post; int HP_clif_skill_delunit_pre; @@ -8360,12 +8376,16 @@ struct { int HP_npc_parseview_post; int HP_npc_viewisid_pre; int HP_npc_viewisid_post; + int HP_npc_create_npc_pre; + int HP_npc_create_npc_post; int HP_npc_add_warp_pre; int HP_npc_add_warp_post; int HP_npc_parse_warp_pre; int HP_npc_parse_warp_post; int HP_npc_parse_shop_pre; int HP_npc_parse_shop_post; + int HP_npc_parse_unknown_object_pre; + int HP_npc_parse_unknown_object_post; int HP_npc_convertlabel_db_pre; int HP_npc_convertlabel_db_post; int HP_npc_skip_script_pre; @@ -8398,6 +8418,8 @@ struct { int HP_npc_parse_mob_post; int HP_npc_parse_mapflag_pre; int HP_npc_parse_mapflag_post; + int HP_npc_parse_unknown_mapflag_pre; + int HP_npc_parse_unknown_mapflag_post; int HP_npc_parsesrcfile_pre; int HP_npc_parsesrcfile_post; int HP_npc_script_event_pre; @@ -8750,8 +8772,12 @@ struct { int HP_pc_resethate_post; int HP_pc_equipitem_pre; int HP_pc_equipitem_post; + int HP_pc_equipitem_pos_pre; + int HP_pc_equipitem_pos_post; int HP_pc_unequipitem_pre; int HP_pc_unequipitem_post; + int HP_pc_unequipitem_pos_pre; + int HP_pc_unequipitem_pos_post; int HP_pc_checkitem_pre; int HP_pc_checkitem_post; int HP_pc_useitem_pre; @@ -9054,8 +9080,6 @@ struct { int HP_pet_skill_bonus_timer_post; int HP_pet_recovery_timer_pre; int HP_pet_recovery_timer_post; - int HP_pet_heal_timer_pre; - int HP_pet_heal_timer_post; int HP_pet_skill_support_timer_pre; int HP_pet_skill_support_timer_post; int HP_pet_read_db_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index 00bd82f94..5d0545f82 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -221,6 +221,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(clif->refresh_ip, HP_clif_refresh_ip) }, { HP_POP(clif->send, HP_clif_send) }, { HP_POP(clif->send_sub, HP_clif_send_sub) }, + { HP_POP(clif->send_actual, HP_clif_send_actual) }, { HP_POP(clif->parse, HP_clif_parse) }, { HP_POP(clif->parse_cmd, HP_clif_parse_cmd) }, { HP_POP(clif->decrypt_cmd, HP_clif_decrypt_cmd) }, @@ -262,6 +263,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(clif->changelook, HP_clif_changelook) }, { HP_POP(clif->changetraplook, HP_clif_changetraplook) }, { HP_POP(clif->refreshlook, HP_clif_refreshlook) }, + { HP_POP(clif->sendlook, HP_clif_sendlook) }, { HP_POP(clif->class_change, HP_clif_class_change) }, { HP_POP(clif->skill_delunit, HP_clif_skill_delunit) }, { HP_POP(clif->skillunit_update, HP_clif_skillunit_update) }, @@ -1677,9 +1679,11 @@ struct HookingPointData HookingPoints[] = { { HP_POP(npc->parsename, HP_npc_parsename) }, { HP_POP(npc->parseview, HP_npc_parseview) }, { HP_POP(npc->viewisid, HP_npc_viewisid) }, + { HP_POP(npc->create_npc, HP_npc_create_npc) }, { HP_POP(npc->add_warp, HP_npc_add_warp) }, { HP_POP(npc->parse_warp, HP_npc_parse_warp) }, { HP_POP(npc->parse_shop, HP_npc_parse_shop) }, + { HP_POP(npc->parse_unknown_object, HP_npc_parse_unknown_object) }, { HP_POP(npc->convertlabel_db, HP_npc_convertlabel_db) }, { HP_POP(npc->skip_script, HP_npc_skip_script) }, { HP_POP(npc->parse_script, HP_npc_parse_script) }, @@ -1696,6 +1700,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(npc->parse_mob2, HP_npc_parse_mob2) }, { HP_POP(npc->parse_mob, HP_npc_parse_mob) }, { HP_POP(npc->parse_mapflag, HP_npc_parse_mapflag) }, + { HP_POP(npc->parse_unknown_mapflag, HP_npc_parse_unknown_mapflag) }, { HP_POP(npc->parsesrcfile, HP_npc_parsesrcfile) }, { HP_POP(npc->script_event, HP_npc_script_event) }, { HP_POP(npc->read_event_script, HP_npc_read_event_script) }, @@ -1876,7 +1881,9 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pc->resetfeel, HP_pc_resetfeel) }, { HP_POP(pc->resethate, HP_pc_resethate) }, { HP_POP(pc->equipitem, HP_pc_equipitem) }, + { HP_POP(pc->equipitem_pos, HP_pc_equipitem_pos) }, { HP_POP(pc->unequipitem, HP_pc_unequipitem) }, + { HP_POP(pc->unequipitem_pos, HP_pc_unequipitem_pos) }, { HP_POP(pc->checkitem, HP_pc_checkitem) }, { HP_POP(pc->useitem, HP_pc_useitem) }, { HP_POP(pc->skillatk_bonus, HP_pc_skillatk_bonus) }, @@ -2029,7 +2036,6 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pet->lootitem_drop, HP_pet_lootitem_drop) }, { HP_POP(pet->skill_bonus_timer, HP_pet_skill_bonus_timer) }, { HP_POP(pet->recovery_timer, HP_pet_recovery_timer) }, - { HP_POP(pet->heal_timer, HP_pet_heal_timer) }, { HP_POP(pet->skill_support_timer, HP_pet_skill_support_timer) }, { HP_POP(pet->read_db, HP_pet_read_db) }, /* quest */ diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index 57a609024..0169d43c7 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -5688,6 +5688,33 @@ int HP_clif_send_sub(struct block_list *bl, va_list ap) { } return retVal___; } +int HP_clif_send_actual(int fd, void *buf, int len) { + int hIndex = 0; + int retVal___ = 0; + if( HPMHooks.count.HP_clif_send_actual_pre ) { + int (*preHookFunc) (int *fd, void *buf, int *len); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_actual_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_send_actual_pre[hIndex].func; + retVal___ = preHookFunc(&fd, buf, &len); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.clif.send_actual(fd, buf, len); + } + if( HPMHooks.count.HP_clif_send_actual_post ) { + int (*postHookFunc) (int retVal___, int *fd, void *buf, int *len); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_send_actual_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_send_actual_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &fd, buf, &len); + } + } + return retVal___; +} int HP_clif_parse(int fd) { int hIndex = 0; int retVal___ = 0; @@ -6757,6 +6784,32 @@ void HP_clif_refreshlook(struct block_list *bl, int id, int type, int val, enum } return; } +void HP_clif_sendlook(struct block_list *bl, int id, int type, int val, int val2, enum send_target target) { + int hIndex = 0; + if( HPMHooks.count.HP_clif_sendlook_pre ) { + void (*preHookFunc) (struct block_list *bl, int *id, int *type, int *val, int *val2, enum send_target *target); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendlook_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_clif_sendlook_pre[hIndex].func; + preHookFunc(bl, &id, &type, &val, &val2, &target); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.clif.sendlook(bl, id, type, val, val2, target); + } + if( HPMHooks.count.HP_clif_sendlook_post ) { + void (*postHookFunc) (struct block_list *bl, int *id, int *type, int *val, int *val2, enum send_target *target); + for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_sendlook_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_clif_sendlook_post[hIndex].func; + postHookFunc(bl, &id, &type, &val, &val2, &target); + } + } + return; +} void HP_clif_class_change(struct block_list *bl, int class_, int type) { int hIndex = 0; if( HPMHooks.count.HP_clif_class_change_pre ) { @@ -44115,6 +44168,33 @@ bool HP_npc_viewisid(const char *viewid) { } return retVal___; } +struct npc_data* HP_npc_create_npc(int m, int x, int y) { + int hIndex = 0; + struct npc_data* retVal___ = NULL; + if( HPMHooks.count.HP_npc_create_npc_pre ) { + struct npc_data* (*preHookFunc) (int *m, int *x, int *y); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_create_npc_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_create_npc_pre[hIndex].func; + retVal___ = preHookFunc(&m, &x, &y); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.npc.create_npc(m, x, y); + } + if( HPMHooks.count.HP_npc_create_npc_post ) { + struct npc_data* (*postHookFunc) (struct npc_data* retVal___, int *m, int *x, int *y); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_create_npc_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_create_npc_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &m, &x, &y); + } + } + return retVal___; +} struct npc_data* HP_npc_add_warp(char *name, short from_mapid, short from_x, short from_y, short xs, short ys, unsigned short to_mapindex, short to_x, short to_y) { int hIndex = 0; struct npc_data* retVal___ = NULL; @@ -44196,6 +44276,33 @@ const char* HP_npc_parse_shop(char *w1, char *w2, char *w3, char *w4, const char } return retVal___; } +const char* HP_npc_parse_unknown_object(char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { + int hIndex = 0; + const char* retVal___ = NULL; + if( HPMHooks.count.HP_npc_parse_unknown_object_pre ) { + const char* (*preHookFunc) (char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_unknown_object_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_parse_unknown_object_pre[hIndex].func; + retVal___ = preHookFunc(w1, w2, w3, w4, start, buffer, filepath, retval); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.npc.parse_unknown_object(w1, w2, w3, w4, start, buffer, filepath, retval); + } + if( HPMHooks.count.HP_npc_parse_unknown_object_post ) { + const char* (*postHookFunc) (const char* retVal___, char *w1, char *w2, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_unknown_object_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_parse_unknown_object_post[hIndex].func; + retVal___ = postHookFunc(retVal___, w1, w2, w3, w4, start, buffer, filepath, retval); + } + } + return retVal___; +} void HP_npc_convertlabel_db(struct npc_label_list *label_list, const char *filepath) { int hIndex = 0; if( HPMHooks.count.HP_npc_convertlabel_db_pre ) { @@ -44627,6 +44734,32 @@ const char* HP_npc_parse_mapflag(char *w1, char *w2, char *w3, char *w4, const c } return retVal___; } +void HP_npc_parse_unknown_mapflag(const char *name, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval) { + int hIndex = 0; + if( HPMHooks.count.HP_npc_parse_unknown_mapflag_pre ) { + void (*preHookFunc) (const char *name, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_unknown_mapflag_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_npc_parse_unknown_mapflag_pre[hIndex].func; + preHookFunc(name, w3, w4, start, buffer, filepath, retval); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.npc.parse_unknown_mapflag(name, w3, w4, start, buffer, filepath, retval); + } + if( HPMHooks.count.HP_npc_parse_unknown_mapflag_post ) { + void (*postHookFunc) (const char *name, char *w3, char *w4, const char *start, const char *buffer, const char *filepath, int *retval); + for(hIndex = 0; hIndex < HPMHooks.count.HP_npc_parse_unknown_mapflag_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_npc_parse_unknown_mapflag_post[hIndex].func; + postHookFunc(name, w3, w4, start, buffer, filepath, retval); + } + } + return; +} int HP_npc_parsesrcfile(const char *filepath, bool runOnInit) { int hIndex = 0; int retVal___ = 0; @@ -49387,6 +49520,32 @@ int HP_pc_equipitem(struct map_session_data *sd, int n, int req_pos) { } return retVal___; } +void HP_pc_equipitem_pos(struct map_session_data *sd, struct item_data *id, int pos) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_equipitem_pos_pre ) { + void (*preHookFunc) (struct map_session_data *sd, struct item_data *id, int *pos); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equipitem_pos_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_equipitem_pos_pre[hIndex].func; + preHookFunc(sd, id, &pos); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.equipitem_pos(sd, id, pos); + } + if( HPMHooks.count.HP_pc_equipitem_pos_post ) { + void (*postHookFunc) (struct map_session_data *sd, struct item_data *id, int *pos); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_equipitem_pos_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_equipitem_pos_post[hIndex].func; + postHookFunc(sd, id, &pos); + } + } + return; +} int HP_pc_unequipitem(struct map_session_data *sd, int n, int flag) { int hIndex = 0; int retVal___ = 0; @@ -49414,6 +49573,32 @@ int HP_pc_unequipitem(struct map_session_data *sd, int n, int flag) { } return retVal___; } +void HP_pc_unequipitem_pos(struct map_session_data *sd, int n, int pos) { + int hIndex = 0; + if( HPMHooks.count.HP_pc_unequipitem_pos_pre ) { + void (*preHookFunc) (struct map_session_data *sd, int *n, int *pos); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_unequipitem_pos_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_pc_unequipitem_pos_pre[hIndex].func; + preHookFunc(sd, &n, &pos); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return; + } + } + { + HPMHooks.source.pc.unequipitem_pos(sd, n, pos); + } + if( HPMHooks.count.HP_pc_unequipitem_pos_post ) { + void (*postHookFunc) (struct map_session_data *sd, int *n, int *pos); + for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_unequipitem_pos_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_pc_unequipitem_pos_post[hIndex].func; + postHookFunc(sd, &n, &pos); + } + } + return; +} int HP_pc_checkitem(struct map_session_data *sd) { int hIndex = 0; int retVal___ = 0; @@ -53492,33 +53677,6 @@ int HP_pet_recovery_timer(int tid, int64 tick, int id, intptr_t data) { } return retVal___; } -int HP_pet_heal_timer(int tid, int64 tick, int id, intptr_t data) { - int hIndex = 0; - int retVal___ = 0; - if( HPMHooks.count.HP_pet_heal_timer_pre ) { - int (*preHookFunc) (int *tid, int64 *tick, int *id, intptr_t *data); - *HPMforce_return = false; - for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_heal_timer_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_pet_heal_timer_pre[hIndex].func; - retVal___ = preHookFunc(&tid, &tick, &id, &data); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.pet.heal_timer(tid, tick, id, data); - } - if( HPMHooks.count.HP_pet_heal_timer_post ) { - int (*postHookFunc) (int retVal___, int *tid, int64 *tick, int *id, intptr_t *data); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pet_heal_timer_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_pet_heal_timer_post[hIndex].func; - retVal___ = postHookFunc(retVal___, &tid, &tick, &id, &data); - } - } - return retVal___; -} int HP_pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) { int hIndex = 0; int retVal___ = 0; @@ -64693,15 +64851,15 @@ unsigned short HP_status_calc_batk(struct block_list *bl, struct status_change * } return retVal___; } -unsigned short HP_status_base_matk(const struct status_data *st, int level) { +unsigned short HP_status_base_matk(struct block_list *bl, const struct status_data *st, int level) { int hIndex = 0; unsigned short retVal___ = 0; if( HPMHooks.count.HP_status_base_matk_pre ) { - unsigned short (*preHookFunc) (const struct status_data *st, int *level); + unsigned short (*preHookFunc) (struct block_list *bl, const struct status_data *st, int *level); *HPMforce_return = false; for(hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_status_base_matk_pre[hIndex].func; - retVal___ = preHookFunc(st, &level); + retVal___ = preHookFunc(bl, st, &level); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -64709,13 +64867,13 @@ unsigned short HP_status_base_matk(const struct status_data *st, int level) { } } { - retVal___ = HPMHooks.source.status.base_matk(st, level); + retVal___ = HPMHooks.source.status.base_matk(bl, st, level); } if( HPMHooks.count.HP_status_base_matk_post ) { - unsigned short (*postHookFunc) (unsigned short retVal___, const struct status_data *st, int *level); + unsigned short (*postHookFunc) (unsigned short retVal___, struct block_list *bl, const struct status_data *st, int *level); for(hIndex = 0; hIndex < HPMHooks.count.HP_status_base_matk_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_status_base_matk_post[hIndex].func; - retVal___ = postHookFunc(retVal___, st, &level); + retVal___ = postHookFunc(retVal___, bl, st, &level); } } return retVal___; |