From 85b248789470161cb7212949b936307b7e05ba4f Mon Sep 17 00:00:00 2001 From: "Hercules.ws" Date: Sun, 20 Dec 2015 17:07:17 +0100 Subject: HPM Hooks Update Signed-off-by: HerculesWSAPI --- .../HPMHooking/HPMHooking_map.HPMHooksCore.inc | 12 ++++ .../HPMHooking/HPMHooking_map.HookingPoints.inc | 3 + src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 81 ++++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc index 59844e766..92b2d4bd5 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc @@ -4456,6 +4456,12 @@ struct { struct HPMHookPoint *HP_script_conv_str_post; struct HPMHookPoint *HP_script_rid2sd_pre; struct HPMHookPoint *HP_script_rid2sd_post; + struct HPMHookPoint *HP_script_id2sd_pre; + struct HPMHookPoint *HP_script_id2sd_post; + struct HPMHookPoint *HP_script_charid2sd_pre; + struct HPMHookPoint *HP_script_charid2sd_post; + struct HPMHookPoint *HP_script_nick2sd_pre; + struct HPMHookPoint *HP_script_nick2sd_post; struct HPMHookPoint *HP_script_detach_rid_pre; struct HPMHookPoint *HP_script_detach_rid_post; struct HPMHookPoint *HP_script_push_val_pre; @@ -10275,6 +10281,12 @@ struct { int HP_script_conv_str_post; int HP_script_rid2sd_pre; int HP_script_rid2sd_post; + int HP_script_id2sd_pre; + int HP_script_id2sd_post; + int HP_script_charid2sd_pre; + int HP_script_charid2sd_post; + int HP_script_nick2sd_pre; + int HP_script_nick2sd_post; int HP_script_detach_rid_pre; int HP_script_detach_rid_post; int HP_script_push_val_pre; diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc index bc78fe8b4..4a18d529d 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc @@ -2282,6 +2282,9 @@ struct HookingPointData HookingPoints[] = { { HP_POP(script->conv_num, HP_script_conv_num) }, { HP_POP(script->conv_str, HP_script_conv_str) }, { HP_POP(script->rid2sd, HP_script_rid2sd) }, + { HP_POP(script->id2sd, HP_script_id2sd) }, + { HP_POP(script->charid2sd, HP_script_charid2sd) }, + { HP_POP(script->nick2sd, HP_script_nick2sd) }, { HP_POP(script->detach_rid, HP_script_detach_rid) }, { HP_POP(script->push_val, HP_script_push_val) }, { HP_POP(script->get_val, HP_script_get_val) }, diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc index 4c828dc56..8f6ec125b 100644 --- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc @@ -59445,6 +59445,87 @@ TBL_PC* HP_script_rid2sd(struct script_state *st) { } return retVal___; } +TBL_PC* HP_script_id2sd(struct script_state *st, int account_id) { + int hIndex = 0; + TBL_PC* retVal___ = NULL; + if( HPMHooks.count.HP_script_id2sd_pre ) { + TBL_PC* (*preHookFunc) (struct script_state *st, int *account_id); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_id2sd_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_id2sd_pre[hIndex].func; + retVal___ = preHookFunc(st, &account_id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.id2sd(st, account_id); + } + if( HPMHooks.count.HP_script_id2sd_post ) { + TBL_PC* (*postHookFunc) (TBL_PC* retVal___, struct script_state *st, int *account_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_id2sd_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_id2sd_post[hIndex].func; + retVal___ = postHookFunc(retVal___, st, &account_id); + } + } + return retVal___; +} +TBL_PC* HP_script_charid2sd(struct script_state *st, int char_id) { + int hIndex = 0; + TBL_PC* retVal___ = NULL; + if( HPMHooks.count.HP_script_charid2sd_pre ) { + TBL_PC* (*preHookFunc) (struct script_state *st, int *char_id); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_charid2sd_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_charid2sd_pre[hIndex].func; + retVal___ = preHookFunc(st, &char_id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.charid2sd(st, char_id); + } + if( HPMHooks.count.HP_script_charid2sd_post ) { + TBL_PC* (*postHookFunc) (TBL_PC* retVal___, struct script_state *st, int *char_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_charid2sd_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_charid2sd_post[hIndex].func; + retVal___ = postHookFunc(retVal___, st, &char_id); + } + } + return retVal___; +} +TBL_PC* HP_script_nick2sd(struct script_state *st, const char *name) { + int hIndex = 0; + TBL_PC* retVal___ = NULL; + if( HPMHooks.count.HP_script_nick2sd_pre ) { + TBL_PC* (*preHookFunc) (struct script_state *st, const char *name); + *HPMforce_return = false; + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_nick2sd_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_script_nick2sd_pre[hIndex].func; + retVal___ = preHookFunc(st, name); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.script.nick2sd(st, name); + } + if( HPMHooks.count.HP_script_nick2sd_post ) { + TBL_PC* (*postHookFunc) (TBL_PC* retVal___, struct script_state *st, const char *name); + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_nick2sd_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_script_nick2sd_post[hIndex].func; + retVal___ = postHookFunc(retVal___, st, name); + } + } + return retVal___; +} void HP_script_detach_rid(struct script_state *st) { int hIndex = 0; if( HPMHooks.count.HP_script_detach_rid_pre ) { -- cgit v1.2.3-60-g2f50