diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-27 02:46:25 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-27 02:46:25 +0000 |
| commit | aeafae0b9a6bb21f28f80728fc61606522e62fdb (patch) | |
| tree | 28418e9a9b324ca97582bb3821320d27ef959f0e | |
| parent | 6637ecab619282c28aec455541a3dedcde34ff67 (diff) | |
| download | hercules-aeafae0b9a6bb21f28f80728fc61606522e62fdb.tar.gz hercules-aeafae0b9a6bb21f28f80728fc61606522e62fdb.tar.bz2 hercules-aeafae0b9a6bb21f28f80728fc61606522e62fdb.tar.xz hercules-aeafae0b9a6bb21f28f80728fc61606522e62fdb.zip | |
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@804 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 1 | ||||
| -rw-r--r-- | src/char_sql/char.c | 2 | ||||
| -rw-r--r-- | src/map/pet.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt index 0a3952c29..9ea499475 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Date Added 12/26 + * Fixed ANOTHER pet crash (double free) (SVN: 804) [MouseJstr] * Added a proper #define for MAX_VENDING (SVN: 802) [MouseJstr] * Fixed crash associated with vending more then 12 items which walked on memory.. corrupting the pet data diff --git a/src/char_sql/char.c b/src/char_sql/char.c index 82c8e2a34..63e47a973 100644 --- a/src/char_sql/char.c +++ b/src/char_sql/char.c @@ -3338,7 +3338,9 @@ int do_init(int argc, char **argv){ #undef mysql_query int debug_mysql_query(char *file, int line, void *mysql, const char *q) { +#ifdef TWILIGHT printf("sql: %s:%d# %s\n", file, line, q); +#endif return mysql_query((MYSQL *) mysql, q); } diff --git a/src/map/pet.c b/src/map/pet.c index 23620f486..80331bd0f 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -608,7 +608,6 @@ int pet_remove_map(struct map_session_data *sd) clif_clearchar_area(&sd->pd->bl,0); map_delblock(&sd->pd->bl); map_deliddb(&sd->pd->bl); - map_freeblock(sd->pd); } return 0; } |