Merge pull request #1987 from guilherme-gm/rodexfixes

Some rodex fixes

3 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking.Defs.inc b/src/plugins/HPMHooking/HPMHooking.Defs.inc
index 822faa0cd..bd17dc7fe 100644
--- a/src/plugins/HPMHooking/HPMHooking.Defs.inc
+++ b/src/plugins/HPMHooking/HPMHooking.Defs.inc
@@ -2358,8 +2358,8 @@ typedef void (*HPMHOOK_pre_clif_rodex_send_maillist) (int *fd, struct map_sessio
 typedef void (*HPMHOOK_post_clif_rodex_send_maillist) (int fd, struct map_session_data *sd, int8 open_type, int64 page_start);
 typedef void (*HPMHOOK_pre_clif_rodex_send_refresh) (int *fd, struct map_session_data **sd, int8 *open_type, int *count);
 typedef void (*HPMHOOK_post_clif_rodex_send_refresh) (int fd, struct map_session_data *sd, int8 open_type, int count);
-typedef void (*HPMHOOK_pre_clif_rodex_send_mails_all) (int *fd, struct map_session_data **sd);
-typedef void (*HPMHOOK_post_clif_rodex_send_mails_all) (int fd, struct map_session_data *sd);
+typedef void (*HPMHOOK_pre_clif_rodex_send_mails_all) (int *fd, struct map_session_data **sd, int64 *mail_id);
+typedef void (*HPMHOOK_post_clif_rodex_send_mails_all) (int fd, struct map_session_data *sd, int64 mail_id);
 typedef void (*HPMHOOK_pre_clif_pRodexReadMail) (int *fd, struct map_session_data **sd);
 typedef void (*HPMHOOK_post_clif_pRodexReadMail) (int fd, struct map_session_data *sd);
 typedef void (*HPMHOOK_pre_clif_rodex_read_mail) (struct map_session_data **sd, int8 *opentype, struct rodex_message **msg);
@@ -4662,8 +4662,8 @@ typedef int (*HPMHOOK_pre_mapif_parse_quest_load) (int *fd);
 typedef int (*HPMHOOK_post_mapif_parse_quest_load) (int retVal___, int fd);
 typedef int (*HPMHOOK_pre_mapif_parse_rodex_requestinbox) (int *fd);
 typedef int (*HPMHOOK_post_mapif_parse_rodex_requestinbox) (int retVal___, int fd);
-typedef void (*HPMHOOK_pre_mapif_rodex_sendinbox) (int *fd, int *char_id, int8 *opentype, int8 *flag, int *count, struct rodex_maillist **mails);
-typedef void (*HPMHOOK_post_mapif_rodex_sendinbox) (int fd, int char_id, int8 opentype, int8 flag, int count, struct rodex_maillist *mails);
+typedef void (*HPMHOOK_pre_mapif_rodex_sendinbox) (int *fd, int *char_id, int8 *opentype, int8 *flag, int *count, int64 *mail_id, struct rodex_maillist **mails);
+typedef void (*HPMHOOK_post_mapif_rodex_sendinbox) (int fd, int char_id, int8 opentype, int8 flag, int count, int64 mail_id, struct rodex_maillist *mails);
 typedef int (*HPMHOOK_pre_mapif_parse_rodex_checkhasnew) (int *fd);
 typedef int (*HPMHOOK_post_mapif_parse_rodex_checkhasnew) (int retVal___, int fd);
 typedef void (*HPMHOOK_pre_mapif_rodex_sendhasnew) (int *fd, int *char_id, bool *has_new);
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index cfd6caee1..6ea10f78f 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -14647,14 +14647,14 @@ int HP_mapif_parse_rodex_requestinbox(int fd) {
 	}
 	return retVal___;
 }
-void HP_mapif_rodex_sendinbox(int fd, int char_id, int8 opentype, int8 flag, int count, struct rodex_maillist *mails) {
+void HP_mapif_rodex_sendinbox(int fd, int char_id, int8 opentype, int8 flag, int count, int64 mail_id, struct rodex_maillist *mails) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_mapif_rodex_sendinbox_pre > 0) {
-		void (*preHookFunc) (int *fd, int *char_id, int8 *opentype, int8 *flag, int *count, struct rodex_maillist **mails);
+		void (*preHookFunc) (int *fd, int *char_id, int8 *opentype, int8 *flag, int *count, int64 *mail_id, struct rodex_maillist **mails);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_rodex_sendinbox_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_mapif_rodex_sendinbox_pre[hIndex].func;
-			preHookFunc(&fd, &char_id, &opentype, &flag, &count, &mails);
+			preHookFunc(&fd, &char_id, &opentype, &flag, &count, &mail_id, &mails);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -14662,13 +14662,13 @@ void HP_mapif_rodex_sendinbox(int fd, int char_id, int8 opentype, int8 flag, int
 		}
 	}
 	{
-		HPMHooks.source.mapif.rodex_sendinbox(fd, char_id, opentype, flag, count, mails);
+		HPMHooks.source.mapif.rodex_sendinbox(fd, char_id, opentype, flag, count, mail_id, mails);
 	}
 	if (HPMHooks.count.HP_mapif_rodex_sendinbox_post > 0) {
-		void (*postHookFunc) (int fd, int char_id, int8 opentype, int8 flag, int count, struct rodex_maillist *mails);
+		void (*postHookFunc) (int fd, int char_id, int8 opentype, int8 flag, int count, int64 mail_id, struct rodex_maillist *mails);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_mapif_rodex_sendinbox_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_mapif_rodex_sendinbox_post[hIndex].func;
-			postHookFunc(fd, char_id, opentype, flag, count, mails);
+			postHookFunc(fd, char_id, opentype, flag, count, mail_id, mails);
 		}
 	}
 	return;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index f42f8fc1c..2e20ab157 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -25420,14 +25420,14 @@ void HP_clif_rodex_send_refresh(int fd, struct map_session_data *sd, int8 open_t
 	}
 	return;
 }
-void HP_clif_rodex_send_mails_all(int fd, struct map_session_data *sd) {
+void HP_clif_rodex_send_mails_all(int fd, struct map_session_data *sd, int64 mail_id) {
 	int hIndex = 0;
 	if (HPMHooks.count.HP_clif_rodex_send_mails_all_pre > 0) {
-		void (*preHookFunc) (int *fd, struct map_session_data **sd);
+		void (*preHookFunc) (int *fd, struct map_session_data **sd, int64 *mail_id);
 		*HPMforce_return = false;
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_rodex_send_mails_all_pre; hIndex++) {
 			preHookFunc = HPMHooks.list.HP_clif_rodex_send_mails_all_pre[hIndex].func;
-			preHookFunc(&fd, &sd);
+			preHookFunc(&fd, &sd, &mail_id);
 		}
 		if (*HPMforce_return) {
 			*HPMforce_return = false;
@@ -25435,13 +25435,13 @@ void HP_clif_rodex_send_mails_all(int fd, struct map_session_data *sd) {
 		}
 	}
 	{
-		HPMHooks.source.clif.rodex_send_mails_all(fd, sd);
+		HPMHooks.source.clif.rodex_send_mails_all(fd, sd, mail_id);
 	}
 	if (HPMHooks.count.HP_clif_rodex_send_mails_all_post > 0) {
-		void (*postHookFunc) (int fd, struct map_session_data *sd);
+		void (*postHookFunc) (int fd, struct map_session_data *sd, int64 mail_id);
 		for (hIndex = 0; hIndex < HPMHooks.count.HP_clif_rodex_send_mails_all_post; hIndex++) {
 			postHookFunc = HPMHooks.list.HP_clif_rodex_send_mails_all_post[hIndex].func;
-			postHookFunc(fd, sd);
+			postHookFunc(fd, sd, mail_id);
 		}
 	}
 	return;