From 45e50a3d2495c420fb2df0cbb447c8c9dc38ed8f Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Fri, 9 Oct 2015 00:24:25 +0200
Subject: [PATCH 1/3] Fixed questlog display for clients from 2014-10-22 on

---
 src/map/clif.c  | 85 ++++++++++++++++++++++++++++++++++++-------------
 src/map/quest.c |  3 ++
 2 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/src/map/clif.c b/src/map/clif.c
index c3f78ff97b..df3379208a 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -15608,40 +15608,81 @@ void clif_parse_PartyTick(int fd, struct map_session_data* sd)
 
 /// Sends list of all quest states (ZC_ALL_QUEST_LIST).
 /// 02b1 <packet len>.W <num>.L { <quest id>.L <active>.B }*num
+/// 097a <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <mob_id>.L <killed>.W <total>.W <mob name>.24B }*count }*num
 void clif_quest_send_list(struct map_session_data *sd)
 {
+#if PACKETVER >= 20141022
+	#define INFOLEN 15
 	int fd = sd->fd;
 	int i;
-#if PACKETVER >= 20141022
-	int info_len = 15;
-	int len = sd->avail_quests*info_len+8;
-	WFIFOHEAD(fd,len);
+	int offset;
+
+	WFIFOHEAD(fd,sd->avail_quests*INFOLEN+8);
 	WFIFOW(fd, 0) = 0x97a;
-#else
-	int info_len = 5;
-	int len = sd->avail_quests*info_len+8;
-	WFIFOHEAD(fd,len);
-	WFIFOW(fd, 0) = 0x2b1;
-#endif
-	WFIFOW(fd, 2) = len;
 	WFIFOL(fd, 4) = sd->avail_quests;
 
+	offset = 8;
+
 	for (i = 0; i < sd->avail_quests; i++) {
-#if PACKETVER >= 20141022
 		struct quest_db *qi = quest_search(sd->quest_log[i].quest_id);
-#endif
-		WFIFOL(fd, i*info_len+8) = sd->quest_log[i].quest_id;
-		WFIFOB(fd, i*info_len+12) = sd->quest_log[i].state;
-#if PACKETVER >= 20141022
-		WFIFOL(fd, i*info_len+13) = sd->quest_log[i].time - qi->time;
-		WFIFOL(fd, i*info_len+17) = sd->quest_log[i].time;
-		WFIFOW(fd, i*info_len+21) = qi->objectives_count;
-#endif
+
+		WFIFOL(fd, offset) = sd->quest_log[i].quest_id;
+		offset += 4;
+		WFIFOB(fd, offset) = sd->quest_log[i].state;
+		offset++;
+		WFIFOL(fd, offset) = sd->quest_log[i].time - qi->time;
+		offset += 4;
+		WFIFOL(fd, offset) = sd->quest_log[i].time;
+		offset += 4;
+		WFIFOW(fd, offset) = qi->objectives_count;
+		offset += 2;
+		
+		if( qi->objectives_count > 0 ){
+			int j;
+			struct mob_db *mob;
+
+			for( j = 0; j < qi->objectives_count; j++ ){
+				mob = mob_db(qi->objectives[j].mob);
+
+				WFIFOL(fd, offset) = qi->objectives[j].mob;
+				offset += 4;
+				WFIFOW(fd, offset) = sd->quest_log[i].count[j];
+				offset += 2;
+				WFIFOW(fd, offset) = qi->objectives[j].count;
+				offset += 2;
+				memcpy(WFIFOP(fd, offset), mob->jname, NAME_LENGTH);
+				offset += NAME_LENGTH;
+			}
+		}
 	}
 
-	WFIFOSET(fd, len);
-}
+	WFIFOW(fd, 2) = offset;	
+	WFIFOSET(fd, offset);
+	#undef INFOLEN
+#else
+	#define INFOLEN 5
+	int i;
+	int offset;
+	int fd = sd->fd;
 
+	WFIFOHEAD(fd,sd->avail_quests*INFOLEN+8);
+	WFIFOW(fd, 0) = 0x2b1;
+	WFIFOL(fd, 4) = sd->avail_quests;
+
+	offset = 8;
+
+	for (i = 0; i < sd->avail_quests; i++) {
+		WFIFOL(fd, offset) = sd->quest_log[i].quest_id;
+		offset += 4;
+		WFIFOB(fd, offset) = sd->quest_log[i].state;
+		offset += 1;
+	}
+	
+	WFIFOW(fd, 2) = offset;
+	WFIFOSET(fd, offset);
+	#undef INFOLEN
+#endif
+}
 
 /// Sends list of all quest missions (ZC_ALL_QUEST_MISSION).
 /// 02b2 <packet len>.W <num>.L { <quest id>.L <start time>.L <expire time>.L <mobs>.W { <mob id>.L <mob count>.W <mob name>.24B }*3 }*num
diff --git a/src/map/quest.c b/src/map/quest.c
index 519c630564..67fd28df5f 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -48,11 +48,14 @@ int quest_pc_login(TBL_PC *sd)
 		return 1;
 
 	clif_quest_send_list(sd);
+
+#if PACKETVER < 20141022
 	clif_quest_send_mission(sd);
 
 	//@TODO[Haru]: Is this necessary? Does quest_send_mission not take care of this?
 	for( i = 0; i < sd->avail_quests; i++ )
 		clif_quest_update_objective(sd, &sd->quest_log[i]);
+#endif
 
 	return 0;
 }

From f11065703483be5a20f504d56fdfb46dc1c04508 Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Fri, 9 Oct 2015 17:19:15 +0200
Subject: [PATCH 2/3] Minor cleanup

---
 src/map/clif.c | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/map/clif.c b/src/map/clif.c
index df3379208a..57b092afa2 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -15611,18 +15611,15 @@ void clif_parse_PartyTick(int fd, struct map_session_data* sd)
 /// 097a <packet len>.W <num>.L { <quest id>.L <active>.B <remaining time>.L <time>.L <count>.W { <mob_id>.L <killed>.W <total>.W <mob name>.24B }*count }*num
 void clif_quest_send_list(struct map_session_data *sd)
 {
-#if PACKETVER >= 20141022
-	#define INFOLEN 15
 	int fd = sd->fd;
 	int i;
-	int offset;
+	int offset = 8;
 
-	WFIFOHEAD(fd,sd->avail_quests*INFOLEN+8);
+#if PACKETVER >= 20141022
+	WFIFOHEAD(fd,sd->avail_quests*15+8);
 	WFIFOW(fd, 0) = 0x97a;
 	WFIFOL(fd, 4) = sd->avail_quests;
 
-	offset = 8;
-
 	for (i = 0; i < sd->avail_quests; i++) {
 		struct quest_db *qi = quest_search(sd->quest_log[i].quest_id);
 
@@ -15658,19 +15655,11 @@ void clif_quest_send_list(struct map_session_data *sd)
 
 	WFIFOW(fd, 2) = offset;	
 	WFIFOSET(fd, offset);
-	#undef INFOLEN
 #else
-	#define INFOLEN 5
-	int i;
-	int offset;
-	int fd = sd->fd;
-
-	WFIFOHEAD(fd,sd->avail_quests*INFOLEN+8);
+	WFIFOHEAD(fd,sd->avail_quests*5+8);
 	WFIFOW(fd, 0) = 0x2b1;
 	WFIFOL(fd, 4) = sd->avail_quests;
 
-	offset = 8;
-
 	for (i = 0; i < sd->avail_quests; i++) {
 		WFIFOL(fd, offset) = sd->quest_log[i].quest_id;
 		offset += 4;
@@ -15680,7 +15669,6 @@ void clif_quest_send_list(struct map_session_data *sd)
 	
 	WFIFOW(fd, 2) = offset;
 	WFIFOSET(fd, offset);
-	#undef INFOLEN
 #endif
 }
 

From 982d6c1f878ea6b5dccd9cfd7d4a5ab74fdf7ead Mon Sep 17 00:00:00 2001
From: Lemongrass3110 <lemongrass@kstp.at>
Date: Fri, 9 Oct 2015 17:25:49 +0200
Subject: [PATCH 3/3] Fixed a warning (unused variable i)

---
 src/map/quest.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/map/quest.c b/src/map/quest.c
index 67fd28df5f..abd535494c 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -42,7 +42,9 @@ struct quest_db *quest_search(int quest_id)
  */
 int quest_pc_login(TBL_PC *sd)
 {
+#if PACKETVER < 20141022
 	int i;
+#endif
 
 	if( sd->avail_quests == 0 )
 		return 1;