- Corrected the homunculus deletion functions so that the homunculus is deleted together with the character.

- Added npc_check_areanpc so that Wand of Hermod will correctly check for nearby warps.
- Emergency avoid now stacks with other speed boost statuses
- Item skills and skills that bring up a menu now are cleared on death.
- Minor cleanings


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9742 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 7 insertions, 2 deletions

diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 4c1358312..ea34d9b10 100644
--- a/src/char_sql/char.c
+++ b/src/char_sql/char.c
@@ -1455,9 +1455,9 @@ int make_new_char_sql(int fd, unsigned char *dat) {
 int delete_char_sql(int char_id, int partner_id)
 {
 	char char_name[NAME_LENGTH], t_name[NAME_LENGTH*2]; //Name needs be escaped.
-	int account_id=0, party_id=0, guild_id=0, char_base_level=0;
+	int account_id, party_id, guild_id, hom_id, char_base_level;
 	
-	sprintf(tmp_sql, "SELECT `name`,`account_id`,`party_id`,`guild_id`,`base_level` FROM `%s` WHERE `char_id`='%d'",char_db, char_id);
+	sprintf(tmp_sql, "SELECT `name`,`account_id`,`party_id`,`guild_id`,`base_level`,`hom_id` FROM `%s` WHERE `char_id`='%d'",char_db, char_id);
 
 	if (mysql_query(&mysql_handle, tmp_sql)) {
 		ShowSQL("DB error - %s\n",mysql_error(&mysql_handle));
@@ -1483,6 +1483,7 @@ int delete_char_sql(int char_id, int partner_id)
 	party_id = atoi(sql_row[2]);
 	guild_id = atoi(sql_row[3]);
 	char_base_level = atoi(sql_row[4]);
+	hom_id = atoi(sql_row[5]);
 	mysql_free_result(sql_res); //Let's free this as soon as possible to avoid problems later on.
 
 	//check for config char del condition [Lupus]
@@ -1545,6 +1546,10 @@ int delete_char_sql(int char_id, int partner_id)
 		}
 	}
 
+	/* remove homunculus */ 
+	if (hom_id)
+		inter_delete_homunculus(hom_id);
+
 	/* delete char's friends list */
 	sprintf(tmp_sql, "DELETE FROM `%s` WHERE `char_id` = '%d'",friend_db, char_id);
 	if(mysql_query(&mysql_handle, tmp_sql)) {