summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-24 04:48:20 -0200
committershennetsind <ind@henn.et>2013-10-24 04:48:20 -0200
commit1904b2d3fb65bb96ef79b642bbe47cba5d10c19e (patch)
treee5f963bb4dbd17bf709e1fb06e42c4127138e485
parent8c5e0386874450ef667adb5155f3b3340d0299f1 (diff)
parentd000ed822efc751b393909d5149ea9b7d70f75d0 (diff)
downloadhercules-1904b2d3fb65bb96ef79b642bbe47cba5d10c19e.tar.gz
hercules-1904b2d3fb65bb96ef79b642bbe47cba5d10c19e.tar.bz2
hercules-1904b2d3fb65bb96ef79b642bbe47cba5d10c19e.tar.xz
hercules-1904b2d3fb65bb96ef79b642bbe47cba5d10c19e.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-rw-r--r--src/plugins/HPMHooking/HPMHooking.Hooks.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index c3e234324..6a5f1328d 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -56406,14 +56406,14 @@ int HP_skill_castend_pos2(struct block_list *src, int x, int y, uint16 skill_id,
}
return retVal___;
}
-int HP_skill_blockpc_start(struct map_session_data *sd, uint16 skill_id, int tick, bool load) {
+int HP_skill_blockpc_start(struct map_session_data *sd, uint16 skill_id, int tick) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_skill_blockpc_start_pre ) {
- int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *tick, bool *load);
+ int (*preHookFunc) (struct map_session_data *sd, uint16 *skill_id, int *tick);
for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockpc_start_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_skill_blockpc_start_pre[hIndex].func;
- retVal___ = preHookFunc(sd, &skill_id, &tick, &load);
+ retVal___ = preHookFunc(sd, &skill_id, &tick);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -56421,13 +56421,13 @@ int HP_skill_blockpc_start(struct map_session_data *sd, uint16 skill_id, int tic
}
}
{
- retVal___ = HPMHooks.source.skill.blockpc_start(sd, skill_id, tick, load);
+ retVal___ = HPMHooks.source.skill.blockpc_start(sd, skill_id, tick);
}
if( HPMHooks.count.HP_skill_blockpc_start_post ) {
- int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, int *tick, bool *load);
+ int (*postHookFunc) (int retVal___, struct map_session_data *sd, uint16 *skill_id, int *tick);
for(hIndex = 0; hIndex < HPMHooks.count.HP_skill_blockpc_start_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_skill_blockpc_start_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, sd, &skill_id, &tick, &load);
+ retVal___ = postHookFunc(retVal___, sd, &skill_id, &tick);
}
}
return retVal___;