summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpanikon <panikon@zoho.com>2014-07-12 15:10:54 -0300
committerpanikon <panikon@zoho.com>2014-07-12 15:10:54 -0300
commitbdb6841a114ee6f4ac029d1bbbb0ce4a6262d498 (patch)
tree82b907dc5cfafda0bb31020c2419fa61a225412a
parent17e4145a5e511a90bb00224f637c83508f86f281 (diff)
parent4b0446decefb84b30a173da4482549969a1e2a88 (diff)
downloadhercules-bdb6841a114ee6f4ac029d1bbbb0ce4a6262d498.tar.gz
hercules-bdb6841a114ee6f4ac029d1bbbb0ce4a6262d498.tar.bz2
hercules-bdb6841a114ee6f4ac029d1bbbb0ce4a6262d498.tar.xz
hercules-bdb6841a114ee6f4ac029d1bbbb0ce4a6262d498.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
-rw-r--r--src/plugins/HPMHooking/HPMHooking.Hooks.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index aeb6305d6..8fc718f20 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -48718,11 +48718,11 @@ int HP_pc_checkjoblevelup(struct map_session_data *sd) {
}
return retVal___;
}
-int HP_pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int base_exp, unsigned int job_exp, bool is_quest) {
+bool HP_pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned int base_exp, unsigned int job_exp, bool is_quest) {
int hIndex = 0;
- int retVal___ = 0;
+ bool retVal___ = false;
if( HPMHooks.count.HP_pc_gainexp_pre ) {
- int (*preHookFunc) (struct map_session_data *sd, struct block_list *src, unsigned int *base_exp, unsigned int *job_exp, bool *is_quest);
+ bool (*preHookFunc) (struct map_session_data *sd, struct block_list *src, unsigned int *base_exp, unsigned int *job_exp, bool *is_quest);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_gainexp_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_pc_gainexp_pre[hIndex].func;
@@ -48737,7 +48737,7 @@ int HP_pc_gainexp(struct map_session_data *sd, struct block_list *src, unsigned
retVal___ = HPMHooks.source.pc.gainexp(sd, src, base_exp, job_exp, is_quest);
}
if( HPMHooks.count.HP_pc_gainexp_post ) {
- int (*postHookFunc) (int retVal___, struct map_session_data *sd, struct block_list *src, unsigned int *base_exp, unsigned int *job_exp, bool *is_quest);
+ bool (*postHookFunc) (bool retVal___, struct map_session_data *sd, struct block_list *src, unsigned int *base_exp, unsigned int *job_exp, bool *is_quest);
for(hIndex = 0; hIndex < HPMHooks.count.HP_pc_gainexp_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_pc_gainexp_post[hIndex].func;
retVal___ = postHookFunc(retVal___, sd, src, &base_exp, &job_exp, &is_quest);