diff options
author | shennetsind <ind@henn.et> | 2013-11-09 17:06:59 -0200 |
---|---|---|
committer | shennetsind <ind@henn.et> | 2013-11-09 17:06:59 -0200 |
commit | 67fdb6b740ba7f8ee155dff6135e64fd85c21728 (patch) | |
tree | 012ebc0497bc2caf317e7c79b2742862ff85bf23 /src/plugins | |
parent | 1be53db78a321436d0ebe6093595b769f10874b6 (diff) | |
parent | 3f77c349d076cfbc2e9bf14588dce504b949340a (diff) | |
download | hercules-67fdb6b740ba7f8ee155dff6135e64fd85c21728.tar.gz hercules-67fdb6b740ba7f8ee155dff6135e64fd85c21728.tar.bz2 hercules-67fdb6b740ba7f8ee155dff6135e64fd85c21728.tar.xz hercules-67fdb6b740ba7f8ee155dff6135e64fd85c21728.zip |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc | 16 | ||||
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking.HookingPoints.inc | 4 | ||||
-rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Hooks.inc | 32 |
3 files changed, 26 insertions, 26 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc index 19917e338..13457ec63 100644 --- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc +++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc @@ -4169,10 +4169,10 @@ struct { struct HPMHookPoint *HP_script_buildin_maprespawnguildid_sub_mob_post; struct HPMHookPoint *HP_script_buildin_mobcount_sub_pre; struct HPMHookPoint *HP_script_buildin_mobcount_sub_post; - struct HPMHookPoint *HP_script_playBGM_sub_pre; - struct HPMHookPoint *HP_script_playBGM_sub_post; - struct HPMHookPoint *HP_script_playBGM_foreachpc_sub_pre; - struct HPMHookPoint *HP_script_playBGM_foreachpc_sub_post; + struct HPMHookPoint *HP_script_playbgm_sub_pre; + struct HPMHookPoint *HP_script_playbgm_sub_post; + struct HPMHookPoint *HP_script_playbgm_foreachpc_sub_pre; + struct HPMHookPoint *HP_script_playbgm_foreachpc_sub_post; struct HPMHookPoint *HP_script_soundeffect_sub_pre; struct HPMHookPoint *HP_script_soundeffect_sub_post; struct HPMHookPoint *HP_script_buildin_query_sql_sub_pre; @@ -9112,10 +9112,10 @@ struct { int HP_script_buildin_maprespawnguildid_sub_mob_post; int HP_script_buildin_mobcount_sub_pre; int HP_script_buildin_mobcount_sub_post; - int HP_script_playBGM_sub_pre; - int HP_script_playBGM_sub_post; - int HP_script_playBGM_foreachpc_sub_pre; - int HP_script_playBGM_foreachpc_sub_post; + int HP_script_playbgm_sub_pre; + int HP_script_playbgm_sub_post; + int HP_script_playbgm_foreachpc_sub_pre; + int HP_script_playbgm_foreachpc_sub_post; int HP_script_soundeffect_sub_pre; int HP_script_soundeffect_sub_post; int HP_script_buildin_query_sql_sub_pre; diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc index 01eb6684b..c5a2f1dc6 100644 --- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc +++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc @@ -2118,8 +2118,8 @@ struct HookingPointData HookingPoints[] = { { HP_POP(script->buildin_maprespawnguildid_sub_pc, HP_script_buildin_maprespawnguildid_sub_pc) }, { HP_POP(script->buildin_maprespawnguildid_sub_mob, HP_script_buildin_maprespawnguildid_sub_mob) }, { HP_POP(script->buildin_mobcount_sub, HP_script_buildin_mobcount_sub) }, - { HP_POP(script->playBGM_sub, HP_script_playBGM_sub) }, - { HP_POP(script->playBGM_foreachpc_sub, HP_script_playBGM_foreachpc_sub) }, + { HP_POP(script->playbgm_sub, HP_script_playbgm_sub) }, + { HP_POP(script->playbgm_foreachpc_sub, HP_script_playbgm_foreachpc_sub) }, { HP_POP(script->soundeffect_sub, HP_script_soundeffect_sub) }, { HP_POP(script->buildin_query_sql_sub, HP_script_buildin_query_sql_sub) }, { HP_POP(script->axtoi, HP_script_axtoi) }, diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index fdf4a6763..25d7eced4 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -53842,14 +53842,14 @@ int HP_script_buildin_mobcount_sub(struct block_list *bl, va_list ap) { } return retVal___; } -int HP_script_playBGM_sub(struct block_list *bl, va_list ap) { +int HP_script_playbgm_sub(struct block_list *bl, va_list ap) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_script_playBGM_sub_pre ) { + if( HPMHooks.count.HP_script_playbgm_sub_pre ) { int (*preHookFunc) (struct block_list *bl, va_list ap); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_sub_pre; hIndex++ ) { + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_sub_pre; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); - preHookFunc = HPMHooks.list.HP_script_playBGM_sub_pre[hIndex].func; + preHookFunc = HPMHooks.list.HP_script_playbgm_sub_pre[hIndex].func; retVal___ = preHookFunc(bl, ap___copy); va_end(ap___copy); } @@ -53860,28 +53860,28 @@ int HP_script_playBGM_sub(struct block_list *bl, va_list ap) { } { va_list ap___copy; va_copy(ap___copy, ap); - retVal___ = HPMHooks.source.script.playBGM_sub(bl, ap___copy); + retVal___ = HPMHooks.source.script.playbgm_sub(bl, ap___copy); va_end(ap___copy); } - if( HPMHooks.count.HP_script_playBGM_sub_post ) { + if( HPMHooks.count.HP_script_playbgm_sub_post ) { int (*postHookFunc) (int retVal___, struct block_list *bl, va_list ap); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_sub_post; hIndex++ ) { + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_sub_post; hIndex++ ) { va_list ap___copy; va_copy(ap___copy, ap); - postHookFunc = HPMHooks.list.HP_script_playBGM_sub_post[hIndex].func; + postHookFunc = HPMHooks.list.HP_script_playbgm_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, bl, ap___copy); va_end(ap___copy); } } return retVal___; } -int HP_script_playBGM_foreachpc_sub(struct map_session_data *sd, va_list args) { +int HP_script_playbgm_foreachpc_sub(struct map_session_data *sd, va_list args) { int hIndex = 0; int retVal___ = 0; - if( HPMHooks.count.HP_script_playBGM_foreachpc_sub_pre ) { + if( HPMHooks.count.HP_script_playbgm_foreachpc_sub_pre ) { int (*preHookFunc) (struct map_session_data *sd, va_list args); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_foreachpc_sub_pre; hIndex++ ) { + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_foreachpc_sub_pre; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); - preHookFunc = HPMHooks.list.HP_script_playBGM_foreachpc_sub_pre[hIndex].func; + preHookFunc = HPMHooks.list.HP_script_playbgm_foreachpc_sub_pre[hIndex].func; retVal___ = preHookFunc(sd, args___copy); va_end(args___copy); } @@ -53892,14 +53892,14 @@ int HP_script_playBGM_foreachpc_sub(struct map_session_data *sd, va_list args) { } { va_list args___copy; va_copy(args___copy, args); - retVal___ = HPMHooks.source.script.playBGM_foreachpc_sub(sd, args___copy); + retVal___ = HPMHooks.source.script.playbgm_foreachpc_sub(sd, args___copy); va_end(args___copy); } - if( HPMHooks.count.HP_script_playBGM_foreachpc_sub_post ) { + if( HPMHooks.count.HP_script_playbgm_foreachpc_sub_post ) { int (*postHookFunc) (int retVal___, struct map_session_data *sd, va_list args); - for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playBGM_foreachpc_sub_post; hIndex++ ) { + for(hIndex = 0; hIndex < HPMHooks.count.HP_script_playbgm_foreachpc_sub_post; hIndex++ ) { va_list args___copy; va_copy(args___copy, args); - postHookFunc = HPMHooks.list.HP_script_playBGM_foreachpc_sub_post[hIndex].func; + postHookFunc = HPMHooks.list.HP_script_playbgm_foreachpc_sub_post[hIndex].func; retVal___ = postHookFunc(retVal___, sd, args___copy); va_end(args___copy); } |