Merge pull request #2108 from MishimaHaruna/mapifcleanup

Mapif cleanup

1 files changed, 16 insertions, 74 deletions

diff --git a/src/char/int_quest.c b/src/char/int_quest.c
index f967e5cfb..afd01579e 100644
--- a/src/char/int_quest.c
+++ b/src/char/int_quest.c
@@ -48,7 +48,7 @@ struct inter_quest_interface *inter_quest;
  * @return Array of found entries. It has *count entries, and it is care of the
  *         caller to aFree() it afterwards.
  */
-struct quest *mapif_quests_fromsql(int char_id, int *count)
+struct quest *inter_quest_fromsql(int char_id, int *count)
 {
 	struct quest *questlog = NULL;
 	struct quest tmp_quest;
@@ -129,7 +129,7 @@ struct quest *mapif_quests_fromsql(int char_id, int *count)
  * @param quest_id Quest ID
  * @return false in case of errors, true otherwise
  */
-bool mapif_quest_delete(int char_id, int quest_id)
+bool inter_quest_delete(int char_id, int quest_id)
 {
 	if (SQL_ERROR == SQL->Query(inter->sql_handle, "DELETE FROM `%s` WHERE `quest_id` = '%d' AND `char_id` = '%d'", quest_db, quest_id, char_id)) {
 		Sql_ShowDebug(inter->sql_handle);
@@ -146,7 +146,7 @@ bool mapif_quest_delete(int char_id, int quest_id)
  * @param qd      Quest data
  * @return false in case of errors, true otherwise
  */
-bool mapif_quest_add(int char_id, struct quest qd)
+bool inter_quest_add(int char_id, struct quest qd)
 {
 	StringBuf buf;
 	int i;
@@ -178,7 +178,7 @@ bool mapif_quest_add(int char_id, struct quest qd)
  * @param qd      Quest data
  * @return false in case of errors, true otherwise
  */
-bool mapif_quest_update(int char_id, struct quest qd)
+bool inter_quest_update(int char_id, struct quest qd)
 {
 	StringBuf buf;
 	int i;
@@ -200,34 +200,13 @@ bool mapif_quest_update(int char_id, struct quest qd)
 	return true;
 }
 
-void mapif_quest_save_ack(int fd, int char_id, bool success)
+bool inter_quest_save(int char_id, const struct quest *new_qd, int new_n)
 {
-	WFIFOHEAD(fd,7);
-	WFIFOW(fd,0) = 0x3861;
-	WFIFOL(fd,2) = char_id;
-	WFIFOB(fd,6) = success?1:0;
-	WFIFOSET(fd,7);
-}
-
-/**
- * Handles the save request from mapserver for a character's questlog.
- *
- * Received quests are saved, and an ack is sent back to the map server.
- *
- * @see inter_parse_frommap
- */
-int mapif_parse_quest_save(int fd)
-{
-	int i, j, k, old_n, new_n = (RFIFOW(fd,2)-8)/sizeof(struct quest);
-	int char_id = RFIFOL(fd,4);
+	int i, j, k, old_n;
 	struct quest *old_qd = NULL;
-	const struct quest *new_qd = NULL;
 	bool success = true;
 
-	if (new_n > 0)
-		new_qd = RFIFOP(fd,8);
-
-	old_qd = mapif->quests_fromsql(char_id, &old_n);
+	old_qd = inter_quest->fromsql(char_id, &old_n);
 
 	for (i = 0; i < new_n; i++) {
 		ARR_FIND( 0, old_n, j, new_qd[i].quest_id == old_qd[j].quest_id );
@@ -237,7 +216,7 @@ int mapif_parse_quest_save(int fd)
 			// Only states and counts are changeable.
 			ARR_FIND( 0, MAX_QUEST_OBJECTIVES, k, new_qd[i].count[k] != old_qd[j].count[k] );
 			if (k != MAX_QUEST_OBJECTIVES || new_qd[i].state != old_qd[j].state)
-				success &= mapif->quest_update(char_id, new_qd[i]);
+				success &= inter_quest->update(char_id, new_qd[i]);
 
 			if (j < (--old_n)) {
 				// Compact array
@@ -246,59 +225,17 @@ int mapif_parse_quest_save(int fd)
 			}
 		} else {
 			// Add new quests
-			success &= mapif->quest_add(char_id, new_qd[i]);
+			success &= inter_quest->add(char_id, new_qd[i]);
 		}
 	}
 
 	for (i = 0; i < old_n; i++) // Quests not in new_qd but in old_qd are to be erased.
-		success &= mapif->quest_delete(char_id, old_qd[i].quest_id);
+		success &= inter_quest->delete(char_id, old_qd[i].quest_id);
 
 	if (old_qd)
 		aFree(old_qd);
 
-	// Send ack
-	mapif->quest_save_ack(fd, char_id, success);
-
-	return 0;
-}
-
-void mapif_send_quests(int fd, int char_id, struct quest *tmp_questlog, int num_quests)
-{
-	WFIFOHEAD(fd,num_quests*sizeof(struct quest)+8);
-	WFIFOW(fd,0) = 0x3860;
-	WFIFOW(fd,2) = num_quests*sizeof(struct quest)+8;
-	WFIFOL(fd,4) = char_id;
-
-	if (num_quests > 0) {
-		nullpo_retv(tmp_questlog);
-		memcpy(WFIFOP(fd,8), tmp_questlog, sizeof(struct quest)*num_quests);
-	}
-
-	WFIFOSET(fd,num_quests*sizeof(struct quest)+8);
-}
-
-/**
- * Sends questlog to the map server
- *
- * Note: Completed quests (state == Q_COMPLETE) are guaranteed to be sent last
- * and the map server relies on this behavior (once the first Q_COMPLETE quest,
- * all of them are considered to be Q_COMPLETE)
- *
- * @see inter_parse_frommap
- */
-int mapif_parse_quest_load(int fd)
-{
-	int char_id = RFIFOL(fd,2);
-	struct quest *tmp_questlog = NULL;
-	int num_quests;
-
-	tmp_questlog = mapif->quests_fromsql(char_id, &num_quests);
-	mapif->send_quests(fd, char_id, tmp_questlog, num_quests);
-
-	if (tmp_questlog)
-		aFree(tmp_questlog);
-
-	return 0;
+	return success;
 }
 
 /**
@@ -322,4 +259,9 @@ void inter_quest_defaults(void)
 	inter_quest = &inter_quest_s;
 
 	inter_quest->parse_frommap = inter_quest_parse_frommap;
+	inter_quest->fromsql = inter_quest_fromsql;
+	inter_quest->delete = inter_quest_delete;
+	inter_quest->add = inter_quest_add;
+	inter_quest->update = inter_quest_update;
+	inter_quest->save = inter_quest_save;
 }