diff options
author | shennetsind <ind@henn.et> | 2014-01-15 16:48:04 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2014-01-15 16:48:04 -0200 |
commit | fee148f5463dafc8681567e330411e24b94f37b6 (patch) | |
tree | 78b6293ba2e4d32d4fc278a367ca32af373bc929 /src | |
parent | a3ccc2de2d7d51202c4e4fc43ccd600d67cc0685 (diff) | |
parent | 31f29768a286ba0fc47a3d7a9470d6fdf37c7546 (diff) | |
download | hercules-fee148f5463dafc8681567e330411e24b94f37b6.tar.gz hercules-fee148f5463dafc8681567e330411e24b94f37b6.tar.bz2 hercules-fee148f5463dafc8681567e330411e24b94f37b6.tar.xz hercules-fee148f5463dafc8681567e330411e24b94f37b6.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src')
-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, 0 insertions, 31 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index 7f26bd208..bef0cec69 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -3495,8 +3495,6 @@ struct { struct HPMHookPoint *HP_pcg_get_level_post; struct HPMHookPoint *HP_pcg_get_idx_pre; struct HPMHookPoint *HP_pcg_get_idx_post; - struct HPMHookPoint *HP_pcg_add_permission_pre; - struct HPMHookPoint *HP_pcg_add_permission_post; struct HPMHookPoint *HP_pc_init_pre; struct HPMHookPoint *HP_pc_init_post; struct HPMHookPoint *HP_pc_final_pre; @@ -8518,8 +8516,6 @@ struct { int HP_pcg_get_level_post; int HP_pcg_get_idx_pre; int HP_pcg_get_idx_post; - int HP_pcg_add_permission_pre; - int HP_pcg_add_permission_post; int HP_pc_init_pre; int HP_pc_init_post; int HP_pc_final_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index e6f593187..42e6593a1 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -1777,7 +1777,6 @@ struct HookingPointData HookingPoints[] = { { HP_POP(pcg->get_name, HP_pcg_get_name) }, { HP_POP(pcg->get_level, HP_pcg_get_level) }, { HP_POP(pcg->get_idx, HP_pcg_get_idx) }, - { HP_POP(pcg->add_permission, HP_pcg_add_permission) }, /* pc */ { HP_POP(pc->init, HP_pc_init) }, { HP_POP(pc->final, HP_pc_final) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index 2e4b62835..64194362c 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -45007,32 +45007,6 @@ int HP_pcg_get_idx(GroupSettings *group) { } return retVal___; } -unsigned int HP_pcg_add_permission(const char *name) { - int hIndex = 0; - unsigned int retVal___ = 0; - if( HPMHooks.count.HP_pcg_add_permission_pre ) { - unsigned int (*preHookFunc) (const char *name); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_add_permission_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_pcg_add_permission_pre[hIndex].func; - retVal___ = preHookFunc(name); - } - if( *HPMforce_return ) { - *HPMforce_return = false; - return retVal___; - } - } - { - retVal___ = HPMHooks.source.pcg.add_permission(name); - } - if( HPMHooks.count.HP_pcg_add_permission_post ) { - unsigned int (*postHookFunc) (unsigned int retVal___, const char *name); - for(hIndex = 0; hIndex < HPMHooks.count.HP_pcg_add_permission_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_pcg_add_permission_post[hIndex].func; - retVal___ = postHookFunc(retVal___, name); - } - } - return retVal___; -} /* pc */ void HP_pc_init(bool minimal) { int hIndex = 0; |