diff options
| author | Paradox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-10-11 01:35:02 +0000 |
|---|---|---|
| committer | Paradox924X <Paradox924X@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-10-11 01:35:02 +0000 |
| commit | 1d1f71cc952146f5334feed0ea29418492b8c216 (patch) | |
| tree | bbeed9c24b55fe06fac36f3943e6ebeb874a7f15 | |
| parent | 3555e1124284de21f8c1c7738f96934a6d581ff2 (diff) | |
| download | hercules-1d1f71cc952146f5334feed0ea29418492b8c216.tar.gz hercules-1d1f71cc952146f5334feed0ea29418492b8c216.tar.bz2 hercules-1d1f71cc952146f5334feed0ea29418492b8c216.tar.xz hercules-1d1f71cc952146f5334feed0ea29418492b8c216.zip | |
Use `char_id` rather than `master` when checking if a guild needs to be deleted during character deletion.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14416 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/char_sql/char.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 102d4d249..e1e483794 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -3,6 +3,8 @@ Date Added AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. +2010/10/10 + * Use `char_id` rather than `master` when checking if a guild needs to be deleted during character deletion. [Paradox924X] 2010/10/06 * Rev. 14413 Touched up the party booking patch, seems I forgot some lines in clif.c...and managed to duplicate a line in map.c. [L0ne_W0lf] 2010/10/05 diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 459fc76fc..4ddc3df31 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -1511,7 +1511,7 @@ int delete_char_sql(int char_id) Sql_ShowDebug(sql_handle); */ - if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `master` = '%s'", guild_db, esc_name) ) + if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `guild_id` FROM `%s` WHERE `char_id` = '%d'", guild_db, char_id) ) Sql_ShowDebug(sql_handle); else if( Sql_NumRows(sql_handle) > 0 ) mapif_parse_BreakGuild(0,guild_id); |