summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHercules.ws <Hercules@efficiently.awesome>2016-02-04 22:20:40 +0100
committerHerculesWSAPI <Hercules@efficiently.awesome>2016-02-04 22:20:40 +0100
commit3414587fe32cf482a80b79b97ee3047e9857f91f (patch)
tree8a573e8232fb5cebca9fc6faecd50f7f769a9cff
parent88a6bbe81cdac8392af63d9732b582fa02b04261 (diff)
downloadhercules-3414587fe32cf482a80b79b97ee3047e9857f91f.tar.gz
hercules-3414587fe32cf482a80b79b97ee3047e9857f91f.tar.bz2
hercules-3414587fe32cf482a80b79b97ee3047e9857f91f.tar.xz
hercules-3414587fe32cf482a80b79b97ee3047e9857f91f.zip
HPM Hooks Update
Signed-off-by: HerculesWSAPI <Hercules@efficiently.awesome>
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc4
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc1
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.Hooks.inc95
3 files changed, 66 insertions, 34 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index f5ac1e70a..2445074f6 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -3480,6 +3480,8 @@ struct {
struct HPMHookPoint *HP_mob_lookup_const_post;
struct HPMHookPoint *HP_mob_get_const_pre;
struct HPMHookPoint *HP_mob_get_const_post;
+ struct HPMHookPoint *HP_mob_db_validate_entry_pre;
+ struct HPMHookPoint *HP_mob_db_validate_entry_post;
struct HPMHookPoint *HP_mob_read_libconfig_pre;
struct HPMHookPoint *HP_mob_read_libconfig_post;
struct HPMHookPoint *HP_mob_read_db_additional_fields_pre;
@@ -9327,6 +9329,8 @@ struct {
int HP_mob_lookup_const_post;
int HP_mob_get_const_pre;
int HP_mob_get_const_post;
+ int HP_mob_db_validate_entry_pre;
+ int HP_mob_db_validate_entry_post;
int HP_mob_read_libconfig_pre;
int HP_mob_read_libconfig_post;
int HP_mob_read_db_additional_fields_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index f7ee233c3..4ec436d51 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1783,6 +1783,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(mob->readdb, HP_mob_readdb) },
{ HP_POP(mob->lookup_const, HP_mob_lookup_const) },
{ HP_POP(mob->get_const, HP_mob_get_const) },
+ { HP_POP(mob->db_validate_entry, HP_mob_db_validate_entry) },
{ HP_POP(mob->read_libconfig, HP_mob_read_libconfig) },
{ HP_POP(mob->read_db_additional_fields, HP_mob_read_db_additional_fields) },
{ HP_POP(mob->read_db_sub, HP_mob_read_db_sub) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 5dfdb8c2a..f7b6ef056 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -46231,6 +46231,33 @@ bool HP_mob_get_const(const config_setting_t *it, int *value) {
}
return retVal___;
}
+int HP_mob_db_validate_entry(struct mob_db *entry, int n, const char *source) {
+ int hIndex = 0;
+ int retVal___ = 0;
+ if( HPMHooks.count.HP_mob_db_validate_entry_pre ) {
+ int (*preHookFunc) (struct mob_db *entry, int *n, const char *source);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_validate_entry_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_mob_db_validate_entry_pre[hIndex].func;
+ retVal___ = preHookFunc(entry, &n, source);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.mob.db_validate_entry(entry, n, source);
+ }
+ if( HPMHooks.count.HP_mob_db_validate_entry_post ) {
+ int (*postHookFunc) (int retVal___, struct mob_db *entry, int *n, const char *source);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_db_validate_entry_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_mob_db_validate_entry_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, entry, &n, source);
+ }
+ }
+ return retVal___;
+}
int HP_mob_read_libconfig(const char *filename, bool ignore_missing) {
int hIndex = 0;
int retVal___ = 0;
@@ -46258,14 +46285,14 @@ int HP_mob_read_libconfig(const char *filename, bool ignore_missing) {
}
return retVal___;
}
-void HP_mob_read_db_additional_fields(struct mob_db *entry, int class_, config_setting_t *it, int n, const char *source) {
+void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it, int n, const char *source) {
int hIndex = 0;
if( HPMHooks.count.HP_mob_read_db_additional_fields_pre ) {
- void (*preHookFunc) (struct mob_db *entry, int *class_, config_setting_t *it, int *n, const char *source);
+ void (*preHookFunc) (struct mob_db *entry, config_setting_t *it, int *n, const char *source);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_pre[hIndex].func;
- preHookFunc(entry, &class_, it, &n, source);
+ preHookFunc(entry, it, &n, source);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -46273,22 +46300,22 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, int class_, config_s
}
}
{
- HPMHooks.source.mob.read_db_additional_fields(entry, class_, it, n, source);
+ HPMHooks.source.mob.read_db_additional_fields(entry, it, n, source);
}
if( HPMHooks.count.HP_mob_read_db_additional_fields_post ) {
- void (*postHookFunc) (struct mob_db *entry, int *class_, config_setting_t *it, int *n, const char *source);
+ void (*postHookFunc) (struct mob_db *entry, config_setting_t *it, int *n, const char *source);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_post[hIndex].func;
- postHookFunc(entry, &class_, it, &n, source);
+ postHookFunc(entry, it, &n, source);
}
}
return;
}
-bool HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
+int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
int hIndex = 0;
- bool retVal___ = false;
+ int retVal___ = 0;
if( HPMHooks.count.HP_mob_read_db_sub_pre ) {
- bool (*preHookFunc) (config_setting_t *mobt, int *id, const char *source);
+ int (*preHookFunc) (config_setting_t *mobt, int *id, const char *source);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_sub_pre[hIndex].func;
@@ -46303,7 +46330,7 @@ bool HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
retVal___ = HPMHooks.source.mob.read_db_sub(mobt, id, source);
}
if( HPMHooks.count.HP_mob_read_db_sub_post ) {
- bool (*postHookFunc) (bool retVal___, config_setting_t *mobt, int *id, const char *source);
+ int (*postHookFunc) (int retVal___, config_setting_t *mobt, int *id, const char *source);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_sub_post[hIndex].func;
retVal___ = postHookFunc(retVal___, mobt, &id, source);
@@ -46311,14 +46338,14 @@ bool HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
}
return retVal___;
}
-void HP_mob_read_db_drops_sub(struct mob_db *entry, struct status_data *mstatus, int class_, config_setting_t *t) {
+void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) {
int hIndex = 0;
if( HPMHooks.count.HP_mob_read_db_drops_sub_pre ) {
- void (*preHookFunc) (struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t);
+ void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_pre[hIndex].func;
- preHookFunc(entry, mstatus, &class_, t);
+ preHookFunc(entry, t);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -46326,25 +46353,25 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, struct status_data *mstatus,
}
}
{
- HPMHooks.source.mob.read_db_drops_sub(entry, mstatus, class_, t);
+ HPMHooks.source.mob.read_db_drops_sub(entry, t);
}
if( HPMHooks.count.HP_mob_read_db_drops_sub_post ) {
- void (*postHookFunc) (struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t);
+ void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_post[hIndex].func;
- postHookFunc(entry, mstatus, &class_, t);
+ postHookFunc(entry, t);
}
}
return;
}
-void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, struct status_data *mstatus, int class_, config_setting_t *t) {
+void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) {
int hIndex = 0;
if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre ) {
- void (*preHookFunc) (struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t);
+ void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_pre[hIndex].func;
- preHookFunc(entry, mstatus, &class_, t);
+ preHookFunc(entry, t);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -46352,26 +46379,26 @@ void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, struct status_data *mstat
}
}
{
- HPMHooks.source.mob.read_db_mvpdrops_sub(entry, mstatus, class_, t);
+ HPMHooks.source.mob.read_db_mvpdrops_sub(entry, t);
}
if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_post ) {
- void (*postHookFunc) (struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t);
+ void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_post[hIndex].func;
- postHookFunc(entry, mstatus, &class_, t);
+ postHookFunc(entry, t);
}
}
return;
}
-int HP_mob_read_db_mode_sub(struct mob_db *entry, struct status_data *mstatus, int class_, config_setting_t *t) {
+int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_mob_read_db_mode_sub_pre ) {
- int (*preHookFunc) (struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t);
+ int (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_pre[hIndex].func;
- retVal___ = preHookFunc(entry, mstatus, &class_, t);
+ retVal___ = preHookFunc(entry, t);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -46379,25 +46406,25 @@ int HP_mob_read_db_mode_sub(struct mob_db *entry, struct status_data *mstatus, i
}
}
{
- retVal___ = HPMHooks.source.mob.read_db_mode_sub(entry, mstatus, class_, t);
+ retVal___ = HPMHooks.source.mob.read_db_mode_sub(entry, t);
}
if( HPMHooks.count.HP_mob_read_db_mode_sub_post ) {
- int (*postHookFunc) (int retVal___, struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t);
+ int (*postHookFunc) (int retVal___, struct mob_db *entry, config_setting_t *t);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, entry, mstatus, &class_, t);
+ retVal___ = postHookFunc(retVal___, entry, t);
}
}
return retVal___;
}
-void HP_mob_read_db_stats_sub(struct mob_db *entry, struct status_data *mstatus, int class_, config_setting_t *t) {
+void HP_mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) {
int hIndex = 0;
if( HPMHooks.count.HP_mob_read_db_stats_sub_pre ) {
- void (*preHookFunc) (struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t);
+ void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_pre[hIndex].func;
- preHookFunc(entry, mstatus, &class_, t);
+ preHookFunc(entry, t);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -46405,13 +46432,13 @@ void HP_mob_read_db_stats_sub(struct mob_db *entry, struct status_data *mstatus,
}
}
{
- HPMHooks.source.mob.read_db_stats_sub(entry, mstatus, class_, t);
+ HPMHooks.source.mob.read_db_stats_sub(entry, t);
}
if( HPMHooks.count.HP_mob_read_db_stats_sub_post ) {
- void (*postHookFunc) (struct mob_db *entry, struct status_data *mstatus, int *class_, config_setting_t *t);
+ void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_post[hIndex].func;
- postHookFunc(entry, mstatus, &class_, t);
+ postHookFunc(entry, t);
}
}
return;