diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-07 21:35:12 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-07 21:35:12 +0000 |
| commit | 033373a5a75599f8607107cb28b97cc6a653b0b5 (patch) | |
| tree | c520e925018ac7de37d05f690d357fcf55b56ec4 /src/char_sql/int_quest.c | |
| parent | 692dd1e5737b01ef26ba889f60d013cb992c3cec (diff) | |
| download | hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.gz hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.bz2 hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.xz hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.zip | |
* Merged changes from trunk [14895:14966/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14967 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql/int_quest.c')
| -rw-r--r-- | src/char_sql/int_quest.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/char_sql/int_quest.c b/src/char_sql/int_quest.c index dd5b915a4..224205412 100644 --- a/src/char_sql/int_quest.c +++ b/src/char_sql/int_quest.c @@ -91,7 +91,7 @@ bool mapif_quest_update(int char_id, struct quest qd) //Save quests int mapif_parse_quest_save(int fd) { - int i, j, num2, num1 = (RFIFOW(fd,2)-8)/sizeof(struct quest); + int i, j, k, num2, num1 = (RFIFOW(fd,2)-8)/sizeof(struct quest); int char_id = RFIFOL(fd,4); struct quest qd1[MAX_QUEST_DB],qd2[MAX_QUEST_DB]; bool success = true; @@ -106,7 +106,8 @@ int mapif_parse_quest_save(int fd) ARR_FIND( 0, num2, j, qd1[i].quest_id == qd2[j].quest_id ); if( j < num2 ) // Update existed quests { // Only states and counts are changable. - if( qd1[i].state != qd2[j].state || qd1[i].count[0] != qd2[j].count[0] || qd1[i].count[1] != qd2[j].count[1] || qd1[i].count[2] != qd2[j].count[2] ) + ARR_FIND( 0, MAX_QUEST_OBJECTIVES, k, qd1[i].count[k] != qd2[j].count[k] ); + if( k != MAX_QUEST_OBJECTIVES || qd1[i].state != qd2[j].state ) success &= mapif_quest_update(char_id, qd1[i]); if( j < (--num2) ) |