diff options
| author | shennetsind <ind@henn.et> | 2013-11-18 23:30:33 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2013-11-18 23:30:33 -0200 |
| commit | 54cc3cd435eb400ea0569632ebef2f2da03efc04 (patch) | |
| tree | ba3737fc030fad384a88828b50f60489904b69a9 | |
| parent | 35c05d58e13dc9637d4151087aee009991bef407 (diff) | |
| parent | 4fa1496d93d5c12651431017160b188a37813bca (diff) | |
| download | hercules-54cc3cd435eb400ea0569632ebef2f2da03efc04.tar.gz hercules-54cc3cd435eb400ea0569632ebef2f2da03efc04.tar.bz2 hercules-54cc3cd435eb400ea0569632ebef2f2da03efc04.tar.xz hercules-54cc3cd435eb400ea0569632ebef2f2da03efc04.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 8 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HookingPoints.inc | 2 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Hooks.inc | 16 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index 992a6f144..9eb34a37f 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -369,8 +369,8 @@ struct { struct HPMHookPoint *HP_chrif_changedsex_post; struct HPMHookPoint *HP_chrif_divorceack_pre; struct HPMHookPoint *HP_chrif_divorceack_post; - struct HPMHookPoint *HP_chrif_accountban_pre; - struct HPMHookPoint *HP_chrif_accountban_post; + struct HPMHookPoint *HP_chrif_idbanned_pre; + struct HPMHookPoint *HP_chrif_idbanned_post; struct HPMHookPoint *HP_chrif_recvfamelist_pre; struct HPMHookPoint *HP_chrif_recvfamelist_post; struct HPMHookPoint *HP_chrif_load_scdata_pre; @@ -5328,8 +5328,8 @@ struct { int HP_chrif_changedsex_post; int HP_chrif_divorceack_pre; int HP_chrif_divorceack_post; - int HP_chrif_accountban_pre; - int HP_chrif_accountban_post; + int HP_chrif_idbanned_pre; + int HP_chrif_idbanned_post; int HP_chrif_recvfamelist_pre; int HP_chrif_recvfamelist_post; int HP_chrif_load_scdata_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index ff9d78ed3..9635ba517 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -193,7 +193,7 @@ struct HookingPointData HookingPoints[] = { { HP_POP(chrif->changemapserverack, HP_chrif_changemapserverack) }, { HP_POP(chrif->changedsex, HP_chrif_changedsex) }, { HP_POP(chrif->divorceack, HP_chrif_divorceack) }, - { HP_POP(chrif->accountban, HP_chrif_accountban) }, + { HP_POP(chrif->idbanned, HP_chrif_idbanned) }, { HP_POP(chrif->recvfamelist, HP_chrif_recvfamelist) }, { HP_POP(chrif->load_scdata, HP_chrif_load_scdata) }, { HP_POP(chrif->update_ip, HP_chrif_update_ip) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index 8665b1e5a..a6d58fb43 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -4793,13 +4793,13 @@ int HP_chrif_divorceack(int char_id, int partner_id) { } return retVal___; } -int HP_chrif_accountban(int fd) { +int HP_chrif_idbanned(int fd) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_chrif_accountban_pre ) { + if( HPMHooks.count.HP_chrif_idbanned_pre ) { int (*preHookFunc) (int *fd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_accountban_pre; hIndex++ ) { - preHookFunc = HPMHooks.list.HP_chrif_accountban_pre[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_idbanned_pre; hIndex++ ) { + preHookFunc = HPMHooks.list.HP_chrif_idbanned_pre[hIndex].func; retVal___ = preHookFunc(&fd); } if( *HPMforce_return ) { @@ -4808,12 +4808,12 @@ int HP_chrif_accountban(int fd) { } } { - retVal___ = HPMHooks.source.chrif.accountban(fd); + retVal___ = HPMHooks.source.chrif.idbanned(fd); } - if( HPMHooks.count.HP_chrif_accountban_post ) { + if( HPMHooks.count.HP_chrif_idbanned_post ) { int (*postHookFunc) (int retVal___, int *fd); - for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_accountban_post; hIndex++ ) { - postHookFunc = HPMHooks.list.HP_chrif_accountban_post[hIndex].func; + for(hIndex = 0; hIndex < HPMHooks.count.HP_chrif_idbanned_post; hIndex++ ) { + postHookFunc = HPMHooks.list.HP_chrif_idbanned_post[hIndex].func; retVal___ = postHookFunc(retVal___, &fd); } } |