From 1013fd3227f78a0b02c121a36a6f66fdcbd75203 Mon Sep 17 00:00:00 2001 From: Inkfish Date: Fri, 21 Aug 2009 07:16:40 +0000 Subject: Fixed the wrong packet length makes client choke when add_quest packets are sent. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14019 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 2 +- src/map/intif.c | 24 +++--------------------- src/map/quest.c | 11 +++-------- 3 files changed, 7 insertions(+), 30 deletions(-) (limited to 'src/map') diff --git a/src/map/clif.c b/src/map/clif.c index 2c5bf1234..14f7730ac 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -13433,7 +13433,7 @@ static int packetdb_readdb(void) 0, 0, 0, 6, 0, 0, 0, 0, 0, 8, 18, 0, 0, 0, 0, 0, 0, 4, 0, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0,117, 6, 0, 7, 7, 22,191, 0, 0, 0, 0, 0, 0, + 0, 0, 0,107, 6, 0, 7, 7, 22,191, 0, 0, 0, 0, 0, 0, //#0x02C0 0, 0, 0, 0, 0, 30, 0, 0, 0, 3, 0, 65, 4, 71, 10, 0, 0, 0, 0, 0, 0, 0, 6, -1, 10, 10, 3, 0, -1, 32, 6, 0, diff --git a/src/map/intif.c b/src/map/intif.c index 9b60d40c0..204fbe497 100644 --- a/src/map/intif.c +++ b/src/map/intif.c @@ -38,7 +38,7 @@ static const int packet_len_table[]={ 10,-1,15, 0, 79,19, 7,-1, 0,-1,-1,-1, 14,67,186,-1, //0x3830 9, 9,-1,14, 0, 0, 0, 0, -1,74,-1,11, 11,-1, 0, 0, //0x3840 -1,-1, 7, 7, 7,11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3850 Auctions [Zephyrus] - -1,-1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3860 Quests [Kevin] [Inkfish] + -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, 0, 0, 0, 0, //0x3870 Mercenaries [Zephyrus] 11,-1, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3880 -1,-1, 7, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //0x3890 Homunculus [albator] @@ -1365,26 +1365,8 @@ int intif_parse_questlog(int fd) int intif_parse_questsave(int fd) { - TBL_PC * sd = map_charid2sd(RFIFOL(fd, 4)); - int i,j; - int count = (RFIFOW(fd, 2) - 8) / 4; - - if( !sd ) - return -1; - - for( i = 0; i < count; i++ ) - { - int qid = RFIFOL(fd, 4*i+8); - - ARR_FIND(0, sd->avail_quests, j, sd->quest_log[j].quest_id == qid); - if(j == sd->avail_quests) //shouldn't happen - { - ShowError("intif_parse_questsave: Quest %d not found in your quest log!\n", qid); - continue; - } - //This packet can't go before 'close' and 'next'. That's weird and why I send it here. [Inkfish] - clif_send_quest_info(sd, &sd->quest_log[j]); - } + if( !RFIFOB(fd, 6) ) + ShowError("intif_parse_questsave: Failed to save quest(s) for character %d!\n", RFIFOL(fd, 2)); return 0; } diff --git a/src/map/quest.c b/src/map/quest.c index 9c1da6aa5..386a030b9 100644 --- a/src/map/quest.c +++ b/src/map/quest.c @@ -103,10 +103,10 @@ int quest_add(TBL_PC * sd, int quest_id) sd->num_quests++; sd->avail_quests++; + clif_send_quest_info(sd, &sd->quest_log[i]); + if( save_settings&64 ) chrif_save(sd,0); - else - intif_quest_save(sd); return 0; } @@ -151,11 +151,10 @@ int quest_change(TBL_PC * sd, int qid1, int qid2) sd->quest_log[i].num_objectives = count; clif_send_quest_delete(sd, qid1); + clif_send_quest_info(sd, &sd->quest_log[i]); if( save_settings&64 ) chrif_save(sd,0); - else - intif_quest_save(sd); return 0; } @@ -182,8 +181,6 @@ int quest_delete(TBL_PC * sd, int quest_id) if( save_settings&64 ) chrif_save(sd,0); - else - intif_quest_save(sd); return 0; } @@ -242,8 +239,6 @@ int quest_update_status(TBL_PC * sd, int quest_id, quest_state status) if( save_settings&64 ) chrif_save(sd,0); - else - intif_quest_save(sd); return 0; } -- cgit v1.2.3-60-g2f50