diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-30 17:38:39 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-30 17:38:39 +0000 |
| commit | bed9459f0edafeab823aa4c0a473828e77e43c15 (patch) | |
| tree | 1fef3bbf08bb8d7b68307df619daad521aab53f6 /src/char_sql | |
| parent | 6f24a7748e12e3dd2e24153bd0a5382d89273b98 (diff) | |
| download | hercules-bed9459f0edafeab823aa4c0a473828e77e43c15.tar.gz hercules-bed9459f0edafeab823aa4c0a473828e77e43c15.tar.bz2 hercules-bed9459f0edafeab823aa4c0a473828e77e43c15.tar.xz hercules-bed9459f0edafeab823aa4c0a473828e77e43c15.zip | |
- Corrected char deletion not working (column is called homun_id, not hom_id...)
- Collapsed config settings produce_item_name_input, produce_potion_name_input, making_arrow_name_input, holywater_name_input, cdp_name_input into a single config produce_item_name_input which uses bitmasks to determine what it affects.
- Updated arrow_decrement to have 3 possible values: Disabled, Enabled, and Enabled as well as giving arrow requirements to skills that do not have them when used with ranged weapons (auto-guess for plagiarized/item-granted skills)
- Minor cleanings
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9746 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql')
| -rw-r--r-- | src/char_sql/char.c | 3 | ||||
| -rw-r--r-- | src/char_sql/int_homun.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/char_sql/char.c b/src/char_sql/char.c index ea34d9b10..52a986394 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -32,6 +32,7 @@ #include "db.h" #include "malloc.h" #include "int_guild.h" +#include "int_homun.h" #include "char.h" #ifndef TXT_SQL_CONVERT @@ -1457,7 +1458,7 @@ 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, party_id, guild_id, hom_id, char_base_level; - 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); + sprintf(tmp_sql, "SELECT `name`,`account_id`,`party_id`,`guild_id`,`base_level`,`homun_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)); diff --git a/src/char_sql/int_homun.c b/src/char_sql/int_homun.c index 206a6a5c1..a7ba26eb6 100644 --- a/src/char_sql/int_homun.c +++ b/src/char_sql/int_homun.c @@ -236,6 +236,7 @@ int mapif_delete_homunculus(int fd) { RFIFOHEAD(fd); mapif_homunculus_deleted(fd, inter_delete_homunculus(RFIFOL(fd,2))); + return 1; } int mapif_rename_homun_ack(int fd, int account_id, int char_id, unsigned char flag, char *name){ |