diff options
| author | panikon <panikon@zoho.com> | 2014-03-20 21:05:55 -0300 |
|---|---|---|
| committer | panikon <panikon@zoho.com> | 2014-03-20 21:05:55 -0300 |
| commit | 6564295157aee6f0d4e7288b77f68dec253c977f (patch) | |
| tree | ca98c84809b8977a4c0709576434ef7416c25252 | |
| parent | c9310f3ffdf0532ee728f256590d516106050885 (diff) | |
| parent | 97b2b65cbe62c8e3a6b694bf6f92be8ec3c08475 (diff) | |
| download | hercules-6564295157aee6f0d4e7288b77f68dec253c977f.tar.gz hercules-6564295157aee6f0d4e7288b77f68dec253c977f.tar.bz2 hercules-6564295157aee6f0d4e7288b77f68dec253c977f.tar.xz hercules-6564295157aee6f0d4e7288b77f68dec253c977f.zip | |
Merge branch 'master' of http://github.com/HerculesWS/Hercules
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 4 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HookingPoints.inc | 1 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Hooks.inc | 26 |
3 files changed, 31 insertions, 0 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index 0f1a72d01..3827f3e84 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -4403,6 +4403,8 @@ struct { struct HPMHookPoint *HP_skill_get_casttype_post; struct HPMHookPoint *HP_skill_get_casttype2_pre; struct HPMHookPoint *HP_skill_get_casttype2_post; + struct HPMHookPoint *HP_skill_is_combo_pre; + struct HPMHookPoint *HP_skill_is_combo_post; struct HPMHookPoint *HP_skill_name2id_pre; struct HPMHookPoint *HP_skill_name2id_post; struct HPMHookPoint *HP_skill_isammotype_pre; @@ -9440,6 +9442,8 @@ struct { int HP_skill_get_casttype_post; int HP_skill_get_casttype2_pre; int HP_skill_get_casttype2_post; + int HP_skill_is_combo_pre; + int HP_skill_is_combo_post; int HP_skill_name2id_pre; int HP_skill_name2id_post; int HP_skill_isammotype_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index d6a6a4af2..8693f6b0f 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -2237,6 +2237,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(skill->chk, HP_skill_chk) }, { HP_POP(skill->get_casttype, HP_skill_get_casttype) }, { HP_POP(skill->get_casttype2, HP_skill_get_casttype2) }, + { HP_POP(skill->is_combo, HP_skill_is_combo) }, { HP_POP(skill->name2id, HP_skill_name2id) }, { HP_POP(skill->isammotype, HP_skill_isammotype) }, { HP_POP(skill->castend_id, HP_skill_castend_id) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index ed3e505b9..f0932f518 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -56894,6 +56894,32 @@ int HP_skill_get_casttype2(uint16 index) { } return retVal___; } +bool HP_skill_is_combo(int skill_id) { + int hIndex = 0; + bool retVal___ = false; + if( HPMHooks.count.HP_skill_is_combo_pre ) { + bool (*preHookFunc) (int *skill_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_is_combo_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_skill_is_combo_pre[hIndex].func; + retVal___ = preHookFunc(&skill_id); + } + if( *HPMforce_return ) { + *HPMforce_return = false; + return retVal___; + } + } + { + retVal___ = HPMHooks.source.skill.is_combo(skill_id); + } + if( HPMHooks.count.HP_skill_is_combo_post ) { + bool (*postHookFunc) (bool retVal___, int *skill_id); + for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_is_combo_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_skill_is_combo_post[hIndex].func; + retVal___ = postHookFunc(retVal___, &skill_id); + } + } + return retVal___; +} int HP_skill_name2id(const char *name) { int hIndex = 0; int retVal___ = 0; |