summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-19 16:22:46 -0300
committershennetsind <ind@henn.et>2013-10-19 16:22:46 -0300
commitd02f9afab959909398e8ebff6ab50186084c68c5 (patch)
tree248df5dd7cdd816884abcfde30b64181f6488b6c /src/plugins
parent93f61040ac281b84c038af72e322a03f60bc6e03 (diff)
parent448dce82b996930e361038dd5c94dd94a6deffe7 (diff)
downloadhercules-d02f9afab959909398e8ebff6ab50186084c68c5.tar.gz
hercules-d02f9afab959909398e8ebff6ab50186084c68c5.tar.bz2
hercules-d02f9afab959909398e8ebff6ab50186084c68c5.tar.xz
hercules-d02f9afab959909398e8ebff6ab50186084c68c5.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc4
-rw-r--r--src/plugins/HPMHooking/HPMHooking.HookingPoints.inc1
-rw-r--r--src/plugins/HPMHooking/HPMHooking.Hooks.inc26
3 files changed, 31 insertions, 0 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
index 03534821e..6fbb45016 100644
--- a/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HPMHooksCore.inc
@@ -2847,6 +2847,8 @@ struct {
struct HPMHookPoint *HP_map_addblcell_post;
struct HPMHookPoint *HP_map_delblcell_pre;
struct HPMHookPoint *HP_map_delblcell_post;
+ struct HPMHookPoint *HP_map_get_new_bonus_id_pre;
+ struct HPMHookPoint *HP_map_get_new_bonus_id_post;
struct HPMHookPoint *HP_mapit_alloc_pre;
struct HPMHookPoint *HP_mapit_alloc_post;
struct HPMHookPoint *HP_mapit_free_pre;
@@ -7726,6 +7728,8 @@ struct {
int HP_map_addblcell_post;
int HP_map_delblcell_pre;
int HP_map_delblcell_post;
+ int HP_map_get_new_bonus_id_pre;
+ int HP_map_get_new_bonus_id_post;
int HP_mapit_alloc_pre;
int HP_mapit_alloc_post;
int HP_mapit_free_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
index dcd283641..6ca0002f4 100644
--- a/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking.HookingPoints.inc
@@ -1445,6 +1445,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(map->arg_next_value, HP_map_arg_next_value) },
{ HP_POP(map->addblcell, HP_map_addblcell) },
{ HP_POP(map->delblcell, HP_map_delblcell) },
+ { HP_POP(map->get_new_bonus_id, HP_map_get_new_bonus_id) },
/* mapit */
{ HP_POP(mapit->alloc, HP_mapit_alloc) },
{ HP_POP(mapit->free, HP_mapit_free) },
diff --git a/src/plugins/HPMHooking/HPMHooking.Hooks.inc b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
index 3d045ece6..9a34af7b4 100644
--- a/src/plugins/HPMHooking/HPMHooking.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Hooks.inc
@@ -36471,6 +36471,32 @@ void HP_map_delblcell(struct block_list *bl) {
}
return;
}
+int HP_map_get_new_bonus_id(void) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_map_get_new_bonus_id_pre ) {
+ int (*preHookFunc) (void);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_map_get_new_bonus_id_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_map_get_new_bonus_id_pre[hIndex].func;
+ retVal___ = preHookFunc();
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.map.get_new_bonus_id();
+ }
+ if( HPMHooks.count.HP_map_get_new_bonus_id_post ) {
+ int (*postHookFunc) (int retVal___);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_map_get_new_bonus_id_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_map_get_new_bonus_id_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___);
+ }
+ }
+ return retVal___;
+}
/* mapit */
struct s_mapiterator* HP_mapit_alloc(enum e_mapitflags flags, enum bl_type types) {
int hIndex = 0;