Merge pull request #2437 from 4144/rodexfixes

Different rodex fixes

4 files changed, 102 insertions, 48 deletions

diff --git a/src/map/intif.c b/src/map/intif.c
index 86bf07bce..e25f56b63 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -2754,16 +2754,21 @@ static void intif_parse_RodexNotifications(int fd)
 ///     2 - user got Items
 ///     3 - delete
 ///     4 - sender Read (returned mail)
-static int intif_rodex_updatemail(int64 mail_id, int8 flag)
+static int intif_rodex_updatemail(struct map_session_data *sd, int64 mail_id, uint8 opentype, int8 flag)
 {
+	nullpo_ret(sd);
+
 	if (intif->CheckForCharServer())
 		return 0;
 
-	WFIFOHEAD(inter_fd, 11);
+	WFIFOHEAD(inter_fd, 20);
 	WFIFOW(inter_fd, 0) = 0x3097;
-	WFIFOQ(inter_fd, 2) = mail_id;
-	WFIFOB(inter_fd, 10) = flag;
-	WFIFOSET(inter_fd, 11);
+	WFIFOL(inter_fd, 2) = sd->status.account_id;
+	WFIFOL(inter_fd, 6) = sd->status.char_id;
+	WFIFOQ(inter_fd, 10) = mail_id;
+	WFIFOB(inter_fd, 18) = opentype;
+	WFIFOB(inter_fd, 19) = flag;
+	WFIFOSET(inter_fd, 20);
 
 	return 0;
 }
@@ -2855,6 +2860,35 @@ static void intif_parse_RodexCheckName(int fd)
 	clif->rodex_checkname_result(sd, target_char_id, target_class, target_level, name);
 }
 
+static void intif_parse_GetZenyAck(int fd)
+{
+	int char_id = RFIFOL(fd, 2);
+	int64 zeny = RFIFOL(fd, 6);
+	int64 mail_id = RFIFOQ(fd, 14);
+	uint8 opentype = RFIFOB(fd, 22);
+	struct map_session_data *sd = map->charid2sd(char_id);
+
+	if (sd == NULL) // User is not online anymore
+		return;
+	rodex->getZenyAck(sd, mail_id, opentype, zeny);
+}
+
+static void intif_parse_GetItemsAck(int fd)
+{
+	int char_id = RFIFOL(fd, 2);
+
+	struct map_session_data *sd = map->charid2sd(char_id);
+	if (sd == NULL) // User is not online anymore
+		return;
+
+	int64 mail_id = RFIFOQ(fd, 6);
+	uint8 opentype = RFIFOB(fd, 14);
+	int count = RFIFOB(fd, 15);
+	struct rodex_item items[RODEX_MAX_ITEM];
+	memcpy(&items[0], RFIFOP(fd, 16), sizeof(struct rodex_item) * RODEX_MAX_ITEM);
+	rodex->getItemsAck(sd, mail_id, opentype, count, &items[0]);
+}
+
 //-----------------------------------------------------------------
 // Communication from the inter server
 // Return a 0 (false) if there were any errors.
@@ -2972,6 +3006,8 @@ static int intif_parse(int fd)
 		case 0x3896: intif->pRodexHasNew(fd); break;
 		case 0x3897: intif->pRodexSendMail(fd); break;
 		case 0x3898: intif->pRodexCheckName(fd); break;
+		case 0x3899: intif->pGetZenyAck(fd); break;
+		case 0x389a: intif->pGetItemsAck(fd); break;
 
 		// Clan System
 		case 0x3858: intif->pRecvClanMemberAction(fd); break;
@@ -3001,7 +3037,7 @@ void intif_defaults(void)
 		-1, 7, 0, 0,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3860  Quests [Kevin] [Inkfish]
 		-1, 3, 3, 0,  0, 0, 0, 0,  0, 0, 0, 0, -1, 3,  3, 0, //0x3870  Mercenaries [Zephyrus] / Elemental [pakpil]
 		14,-1, 7, 3,  0, 0, 0, 0,  0, 0, 0, 0,  0, 0,  0, 0, //0x3880
-		-1,-1, 7, 3,  0,-1, 7, 15,18 + NAME_LENGTH, 0, 0, 0, 0, 0, 0, 0, //0x3890  Homunculus [albator] / RoDEX [KirieZ]
+		-1,-1, 7, 3,  0,-1, 7, 15,18 + NAME_LENGTH, 23, 16 + sizeof(struct rodex_item) * RODEX_MAX_ITEM, 0, 0, 0, 0, 0, //0x3890  Homunculus [albator] / RoDEX [KirieZ]
 	};
 
 	intif = &intif_s;
@@ -3171,6 +3207,8 @@ void intif_defaults(void)
 	intif->pRodexHasNew = intif_parse_RodexNotifications;
 	intif->pRodexSendMail = intif_parse_RodexSendMail;
 	intif->pRodexCheckName = intif_parse_RodexCheckName;
+	intif->pGetZenyAck = intif_parse_GetZenyAck;
+	intif->pGetItemsAck = intif_parse_GetItemsAck;
 	/* Clan System */
 	intif->pRecvClanMemberAction = intif_parse_RecvClanMemberAction;
 	/* Achievement System */
diff --git a/src/map/intif.h b/src/map/intif.h
index 425ab1d18..8df669217 100644
--- a/src/map/intif.h
+++ b/src/map/intif.h
@@ -135,9 +135,11 @@ struct intif_interface {
 	// RoDEX
 	int(*rodex_requestinbox) (int char_id, int account_id, int8 flag, int8 opentype, int64 mail_id);
 	int(*rodex_checkhasnew) (struct map_session_data *sd);
-	int(*rodex_updatemail) (int64 mail_id, int8 flag);
+	int(*rodex_updatemail) (struct map_session_data *sd, int64 mail_id, uint8 opentype, int8 flag);
 	int(*rodex_sendmail) (struct rodex_message *msg);
 	int(*rodex_checkname) (struct map_session_data *sd, const char *name);
+	void (*pGetZenyAck) (int fd);
+	void (*pGetItemsAck) (int fd);
 	/* Clan System */
 	int (*clan_kickoffline) (int clan_id, int kick_interval);
 	int (*clan_membercount) (int clan_id, int kick_interval);
diff --git a/src/map/rodex.c b/src/map/rodex.c
index 33070c5f8..766fdc5ea 100644
--- a/src/map/rodex.c
+++ b/src/map/rodex.c
@@ -404,12 +404,12 @@ static void rodex_read_mail(struct map_session_data *sd, int64 mail_id)
 
 	if (msg->opentype == RODEX_OPENTYPE_RETURN) {
 		if (msg->sender_read == false) {
-			intif->rodex_updatemail(msg->id, 4);
+			intif->rodex_updatemail(sd, msg->id, 0, 4);
 			msg->sender_read = true;
 		}
 	} else {
 		if (msg->is_read == false) {
-			intif->rodex_updatemail(msg->id, 0);
+			intif->rodex_updatemail(sd, msg->id, 0, 0);
 			msg->is_read = true;
 		}
 	}
@@ -430,21 +430,36 @@ static void rodex_delete_mail(struct map_session_data *sd, int64 mail_id)
 	nullpo_retv(msg);
 
 	msg->is_deleted = true;
-	intif->rodex_updatemail(msg->id, 3);
+	intif->rodex_updatemail(sd, msg->id, 0, 3);
 
 	clif->rodex_delete_mail(sd, msg->opentype, msg->id);
 }
 
+/// give requested zeny from message to player
+static void rodex_getZenyAck(struct map_session_data *sd, int64 mail_id, int8 opentype, int64 zeny)
+{
+	nullpo_retv(sd);
+	if (zeny <= 0) {
+		clif->rodex_request_zeny(sd, opentype, mail_id, RODEX_GET_ZENY_FATAL_ERROR);
+		return;
+	}
+
+	if (pc->getzeny(sd, (int)zeny, LOG_TYPE_MAIL, NULL) != 0) {
+		clif->rodex_request_zeny(sd, opentype, mail_id, RODEX_GET_ZENY_FATAL_ERROR);
+		return;
+	}
+
+	clif->rodex_request_zeny(sd, opentype, mail_id, RODEX_GET_ZENY_SUCCESS);
+}
+
 /// Gets attached zeny
 /// @param sd : Who's getting
 /// @param mail_id : Mail ID that we're getting zeny from
 static void rodex_get_zeny(struct map_session_data *sd, int8 opentype, int64 mail_id)
 {
-	struct rodex_message *msg;
-
 	nullpo_retv(sd);
 
-	msg = rodex->get_mail(sd, mail_id);
+	struct rodex_message *msg = rodex->get_mail(sd, mail_id);
 
 	if (msg == NULL) {
 		clif->rodex_request_zeny(sd, opentype, mail_id, RODEX_GET_ZENY_FATAL_ERROR);
@@ -456,16 +471,31 @@ static void rodex_get_zeny(struct map_session_data *sd, int8 opentype, int64 mai
 		return;
 	}
 
-	if (pc->getzeny(sd, (int)msg->zeny, LOG_TYPE_MAIL, NULL) != 0) {
-		clif->rodex_request_zeny(sd, opentype, mail_id, RODEX_GET_ZENY_FATAL_ERROR);
-		return;
-	}
-
 	msg->type &= ~MAIL_TYPE_ZENY;
 	msg->zeny = 0;
-	intif->rodex_updatemail(mail_id, 1);
+	intif->rodex_updatemail(sd, mail_id, opentype, 1);
+}
 
-	clif->rodex_request_zeny(sd, opentype, mail_id, RODEX_GET_ZENY_SUCCESS);
+// give requested items from message to player
+static void rodex_getItemsAck(struct map_session_data *sd, int64 mail_id, int8 opentype, int count, const struct rodex_item *items)
+{
+	nullpo_retv(sd);
+	nullpo_retv(items);
+
+	for (int i = 0; i < count; ++i) {
+		const struct item *it = &items[i].item;
+
+		if (it->nameid == 0) {
+			continue;
+		}
+
+		if (pc->additem(sd, it, it->amount, LOG_TYPE_MAIL) != 0) {
+			clif->rodex_request_items(sd, opentype, mail_id, RODEX_GET_ITEM_FULL_ERROR);
+			return;
+		}
+	}
+
+	clif->rodex_request_items(sd, opentype, mail_id, RODEX_GET_ITEMS_SUCCESS);
 }
 
 /// Gets attached item
@@ -473,14 +503,12 @@ static void rodex_get_zeny(struct map_session_data *sd, int8 opentype, int64 mai
 /// @param mail_id : Mail ID that we're getting items from
 static void rodex_get_items(struct map_session_data *sd, int8 opentype, int64 mail_id)
 {
-	struct rodex_message *msg;
-	int weight = 0;
-	int empty_slots = 0, required_slots;
-	int i;
-
 	nullpo_retv(sd);
 
-	msg = rodex->get_mail(sd, mail_id);
+	int weight = 0;
+	int empty_slots = 0;
+
+	struct rodex_message *msg = rodex->get_mail(sd, mail_id);
 
 	if (msg == NULL) {
 		clif->rodex_request_items(sd, opentype, mail_id, RODEX_GET_ITEM_FATAL_ERROR);
@@ -492,7 +520,7 @@ static void rodex_get_items(struct map_session_data *sd, int8 opentype, int64 ma
 		return;
 	}
 
-	for (i = 0; i < RODEX_MAX_ITEM; ++i) {
+	for (int i = 0; i < RODEX_MAX_ITEM; ++i) {
 		if (msg->items[i].item.nameid != 0) {
 			weight += itemdb->search(msg->items[i].item.nameid)->weight * msg->items[i].item.amount;
 		}
@@ -503,8 +531,8 @@ static void rodex_get_items(struct map_session_data *sd, int8 opentype, int64 ma
 		return;
 	}
 
-	required_slots = msg->items_count;
-	for (i = 0; i < sd->status.inventorySize; ++i) {
+	int required_slots = msg->items_count;
+	for (int i = 0; i < sd->status.inventorySize; ++i) {
 		if (sd->status.inventory[i].nameid == 0) {
 			empty_slots++;
 		} else if (itemdb->isstackable(sd->status.inventory[i].nameid) == 1) {
@@ -529,27 +557,9 @@ static void rodex_get_items(struct map_session_data *sd, int8 opentype, int64 ma
 		return;
 	}
 
-	for (i = 0; i < RODEX_MAX_ITEM; ++i) {
-		struct item *it = &msg->items[i].item;
-
-		if (it->nameid == 0) {
-			continue;
-		}
-
-		if (pc->additem(sd, it, it->amount, LOG_TYPE_MAIL) != 0) {
-			clif->rodex_request_items(sd, opentype, mail_id, RODEX_GET_ITEM_FULL_ERROR);
-			intif->rodex_updatemail(mail_id, 2);
-			return;
-		} else {
-			memset(it, 0x0, sizeof(*it));
-		}
-	}
-
 	msg->type &= ~MAIL_TYPE_ITEM;
 	msg->items_count = 0;
-	intif->rodex_updatemail(mail_id, 2);
-
-	clif->rodex_request_items(sd, opentype, mail_id, RODEX_GET_ITEMS_SUCCESS);
+	intif->rodex_updatemail(sd, mail_id, opentype, 2);
 }
 
 /// Cleans user's RoDEX related data
@@ -668,4 +678,6 @@ void rodex_defaults(void)
 	rodex->get_zeny = rodex_get_zeny;
 	rodex->get_items = rodex_get_items;
 	rodex->clean = rodex_clean;
+	rodex->getZenyAck = rodex_getZenyAck;
+	rodex->getItemsAck = rodex_getItemsAck;
 }
diff --git a/src/map/rodex.h b/src/map/rodex.h
index 56cc3a9d1..b6e7ca5b7 100644
--- a/src/map/rodex.h
+++ b/src/map/rodex.h
@@ -74,6 +74,8 @@ struct rodex_interface {
 	void (*get_items) (struct map_session_data *sd, int8 opentype, int64 mail_id);
 	void (*delete_mail) (struct map_session_data *sd, int64 mail_id);
 	void (*clean) (struct map_session_data *sd, int8 flag);
+	void (*getZenyAck) (struct map_session_data *sd, int64 mail_id, int8 opentype, int64 zeny);
+	void (*getItemsAck) (struct map_session_data *sd, int64 mail_id, int8 opentype, int count, const struct rodex_item *items);
 };
 
 #ifdef HERCULES_CORE