HPM Hooks Update

4 files changed, 144 insertions, 10 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index ae503fa38..88e57455a 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -6028,8 +6028,16 @@ typedef int (*HPMHOOK_pre_pet_recovery_timer) (int *tid, int64 *tick, int *id, i
 typedef int (*HPMHOOK_post_pet_recovery_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
 typedef int (*HPMHOOK_pre_pet_skill_support_timer) (int *tid, int64 *tick, int *id, intptr_t *data);
 typedef int (*HPMHOOK_post_pet_skill_support_timer) (int retVal___, int tid, int64 tick, int id, intptr_t data);
-typedef int (*HPMHOOK_pre_pet_read_db) (void);
-typedef int (*HPMHOOK_post_pet_read_db) (int retVal___);
+typedef void (*HPMHOOK_pre_pet_read_db) (void);
+typedef void (*HPMHOOK_post_pet_read_db) (void);
+typedef int (*HPMHOOK_pre_pet_read_db_libconfig) (const char **filename, bool *ignore_missing);
+typedef int (*HPMHOOK_post_pet_read_db_libconfig) (int retVal___, const char *filename, bool ignore_missing);
+typedef int (*HPMHOOK_pre_pet_read_db_sub) (struct config_setting_t **it, int *n, const char **source);
+typedef int (*HPMHOOK_post_pet_read_db_sub) (int retVal___, struct config_setting_t *it, int n, const char *source);
+typedef bool (*HPMHOOK_pre_pet_read_db_sub_intimacy) (int *idx, struct config_setting_t **t);
+typedef bool (*HPMHOOK_post_pet_read_db_sub_intimacy) (bool retVal___, int idx, struct config_setting_t *t);
+typedef void (*HPMHOOK_pre_pet_read_db_clear) (void);
+typedef void (*HPMHOOK_post_pet_read_db_clear) (void);
 #endif // MAP_PET_H
 #ifdef CHAR_PINCODE_H /* pincode */
 typedef void (*HPMHOOK_pre_pincode_handle) (int *fd, struct char_session_data **sd);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 4d15e4784..00bfb650c 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -4680,6 +4680,14 @@ struct {
 	struct HPMHookPoint *HP_pet_skill_support_timer_post;
 	struct HPMHookPoint *HP_pet_read_db_pre;
 	struct HPMHookPoint *HP_pet_read_db_post;
+	struct HPMHookPoint *HP_pet_read_db_libconfig_pre;
+	struct HPMHookPoint *HP_pet_read_db_libconfig_post;
+	struct HPMHookPoint *HP_pet_read_db_sub_pre;
+	struct HPMHookPoint *HP_pet_read_db_sub_post;
+	struct HPMHookPoint *HP_pet_read_db_sub_intimacy_pre;
+	struct HPMHookPoint *HP_pet_read_db_sub_intimacy_post;
+	struct HPMHookPoint *HP_pet_read_db_clear_pre;
+	struct HPMHookPoint *HP_pet_read_db_clear_post;
 	struct HPMHookPoint *HP_quest_init_pre;
 	struct HPMHookPoint *HP_quest_init_post;
 	struct HPMHookPoint *HP_quest_final_pre;
@@ -10971,6 +10979,14 @@ struct {
 	int HP_pet_skill_support_timer_post;
 	int HP_pet_read_db_pre;
 	int HP_pet_read_db_post;
+	int HP_pet_read_db_libconfig_pre;
+	int HP_pet_read_db_libconfig_post;
+	int HP_pet_read_db_sub_pre;
+	int HP_pet_read_db_sub_post;
+	int HP_pet_read_db_sub_intimacy_pre;
+	int HP_pet_read_db_sub_intimacy_post;
+	int HP_pet_read_db_clear_pre;
+	int HP_pet_read_db_clear_post;
 	int HP_quest_init_pre;
 	int HP_quest_init_post;
 	int HP_quest_final_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 6191bea21..fa6de9ff0 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -2398,6 +2398,10 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(pet->recovery_timer, HP_pet_recovery_timer) },
 	{ HP_POP(pet->skill_support_timer, HP_pet_skill_support_timer) },
 	{ HP_POP(pet->read_db, HP_pet_read_db) },
+	{ HP_POP(pet->read_db_libconfig, HP_pet_read_db_libconfig) },
+	{ HP_POP(pet->read_db_sub, HP_pet_read_db_sub) },
+	{ HP_POP(pet->read_db_sub_intimacy, HP_pet_read_db_sub_intimacy) },
+	{ HP_POP(pet->read_db_clear, HP_pet_read_db_clear) },
 /* quest_interface */
 	{ HP_POP(quest->init, HP_quest_init) },
 	{ HP_POP(quest->final, HP_quest_final) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 51206c6f5..743e03300 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -62332,33 +62332,139 @@ int HP_pet_skill_support_timer(int tid, int64 tick, int id, intptr_t data) {
 	}
 	return retVal___;
 }
-int HP_pet_read_db(void) {
+void HP_pet_read_db(void) {
 	int hIndex = 0;
-	int retVal___ = 0;
 	if (HPMHooks.count.HP_pet_read_db_pre > 0) {
-		int (*preHookFunc) (void);
+		void (*preHookFunc) (void);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_pet_read_db_pre[hIndex].func;
-			retVal___ = preHookFunc();
+			preHookFunc();
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
-			return retVal___;
+			return;
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.pet.read_db();
+		HPMHooks.source.pet.read_db();
 	}
 	if (HPMHooks.count.HP_pet_read_db_post > 0) {
-		int (*postHookFunc) (int retVal___);
+		void (*postHookFunc) (void);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_pet_read_db_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___);
+			postHookFunc();
+		}
+	}
+	return;
+}
+int HP_pet_read_db_libconfig(const char *filename, bool ignore_missing) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_pet_read_db_libconfig_pre > 0) {
+		int (*preHookFunc) (const char **filename, bool *ignore_missing);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_libconfig_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pet_read_db_libconfig_pre[hIndex].func;
+			retVal___ = preHookFunc(&filename, &ignore_missing);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pet.read_db_libconfig(filename, ignore_missing);
+	}
+	if (HPMHooks.count.HP_pet_read_db_libconfig_post > 0) {
+		int (*postHookFunc) (int retVal___, const char *filename, bool ignore_missing);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_libconfig_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pet_read_db_libconfig_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, filename, ignore_missing);
+		}
+	}
+	return retVal___;
+}
+int HP_pet_read_db_sub(struct config_setting_t *it, int n, const char *source) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if (HPMHooks.count.HP_pet_read_db_sub_pre > 0) {
+		int (*preHookFunc) (struct config_setting_t **it, int *n, const char **source);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_sub_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pet_read_db_sub_pre[hIndex].func;
+			retVal___ = preHookFunc(&it, &n, &source);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pet.read_db_sub(it, n, source);
+	}
+	if (HPMHooks.count.HP_pet_read_db_sub_post > 0) {
+		int (*postHookFunc) (int retVal___, struct config_setting_t *it, int n, const char *source);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_sub_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pet_read_db_sub_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, it, n, source);
 		}
 	}
 	return retVal___;
 }
+bool HP_pet_read_db_sub_intimacy(int idx, struct config_setting_t *t) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if (HPMHooks.count.HP_pet_read_db_sub_intimacy_pre > 0) {
+		bool (*preHookFunc) (int *idx, struct config_setting_t **t);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_sub_intimacy_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pet_read_db_sub_intimacy_pre[hIndex].func;
+			retVal___ = preHookFunc(&idx, &t);
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.pet.read_db_sub_intimacy(idx, t);
+	}
+	if (HPMHooks.count.HP_pet_read_db_sub_intimacy_post > 0) {
+		bool (*postHookFunc) (bool retVal___, int idx, struct config_setting_t *t);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_sub_intimacy_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pet_read_db_sub_intimacy_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, idx, t);
+		}
+	}
+	return retVal___;
+}
+void HP_pet_read_db_clear(void) {
+	int hIndex = 0;
+	if (HPMHooks.count.HP_pet_read_db_clear_pre > 0) {
+		void (*preHookFunc) (void);
+		*HPMforce_return = false;
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_clear_pre; hIndex++) {
+			preHookFunc = HPMHooks.list.HP_pet_read_db_clear_pre[hIndex].func;
+			preHookFunc();
+		}
+		if (*HPMforce_return) {
+			*HPMforce_return = false;
+			return;
+		}
+	}
+	{
+		HPMHooks.source.pet.read_db_clear();
+	}
+	if (HPMHooks.count.HP_pet_read_db_clear_post > 0) {
+		void (*postHookFunc) (void);
+		for (hIndex = 0; hIndex < HPMHooks.count.HP_pet_read_db_clear_post; hIndex++) {
+			postHookFunc = HPMHooks.list.HP_pet_read_db_clear_post[hIndex].func;
+			postHookFunc();
+		}
+	}
+	return;
+}
 /* quest_interface */
 void HP_quest_init(bool minimal) {
 	int hIndex = 0;