diff options
| author | shennetsind <ind@henn.et> | 2014-02-06 10:28:33 -0200 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-02-06 10:28:33 -0200 |
| commit | ff4478dcc51713a37a7db957a7a7747253307c48 (patch) | |
| tree | 18362385726d5ebea331c8cd0a9b58dd75ff7b48 | |
| parent | 10c160a3317b63a8c59830f836b5adefb788e652 (diff) | |
| parent | a056adb42babe2373e548919855812f6838feddb (diff) | |
| download | hercules-ff4478dcc51713a37a7db957a7a7747253307c48.tar.gz hercules-ff4478dcc51713a37a7db957a7a7747253307c48.tar.bz2 hercules-ff4478dcc51713a37a7db957a7a7747253307c48.tar.xz hercules-ff4478dcc51713a37a7db957a7a7747253307c48.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
| -rw-r--r-- | AUTHORS | 5 | ||||
| -rw-r--r-- | src/plugins/HPMHooking/HPMHooking.Hooks.inc | 12 |
2 files changed, 11 insertions, 6 deletions
@@ -178,6 +178,7 @@ non npc nsstrunks nyankochan +orn p Paradox924X Peter Kieser @@ -202,6 +203,7 @@ Sel shadow shadoweathena shadowlady +shazeya Shinigami shinomori Shinryo @@ -227,8 +229,10 @@ Tharis Theia theultramage tk44 +ToastOfDoom toms Toshi^2 +Trancid Trojal Tsuyuki V&S @@ -239,6 +243,7 @@ whitedog Wizputer Wolf Xgear +Yhn Yommy Yor Yuuki diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc index c3c6a492f..e2ed78729 100644 --- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc +++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc @@ -10445,13 +10445,13 @@ void HP_clif_specialeffect_value(struct block_list *bl, int effect_id, int num, } return; } -void HP_clif_millenniumshield(struct map_session_data *sd, short shields) { +void HP_clif_millenniumshield(struct block_list *bl, short shields) { int hIndex = 0; if( HPMHooks.count.HP_clif_millenniumshield_pre ) { - void (*preHookFunc) (struct map_session_data *sd, short *shields); + void (*preHookFunc) (struct block_list *bl, short *shields); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_millenniumshield_pre; hIndex++ ) { preHookFunc = HPMHooks.list.HP_clif_millenniumshield_pre[hIndex].func; - preHookFunc(sd, &shields); + preHookFunc(bl, &shields); } if( *HPMforce_return ) { *HPMforce_return = false; @@ -10459,13 +10459,13 @@ void HP_clif_millenniumshield(struct map_session_data *sd, short shields) { } } { - HPMHooks.source.clif.millenniumshield(sd, shields); + HPMHooks.source.clif.millenniumshield(bl, shields); } if( HPMHooks.count.HP_clif_millenniumshield_post ) { - void (*postHookFunc) (struct map_session_data *sd, short *shields); + void (*postHookFunc) (struct block_list *bl, short *shields); for(hIndex = 0; hIndex < HPMHooks.count.HP_clif_millenniumshield_post; hIndex++ ) { postHookFunc = HPMHooks.list.HP_clif_millenniumshield_post[hIndex].func; - postHookFunc(sd, &shields); + postHookFunc(bl, &shields); } } return; |