diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-31 16:09:50 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-08-31 16:09:50 +0000 |
| commit | 693613de2eda402fe459809cbe7ea22cbd052218 (patch) | |
| tree | 8f4da46add7a622825742986fcb055ff0a0374a3 /src/map/map.c | |
| parent | 0415b6b6e9ca2a6d08d38fd811e21ffb641a9265 (diff) | |
| download | hercules-693613de2eda402fe459809cbe7ea22cbd052218.tar.gz hercules-693613de2eda402fe459809cbe7ea22cbd052218.tar.bz2 hercules-693613de2eda402fe459809cbe7ea22cbd052218.tar.xz hercules-693613de2eda402fe459809cbe7ea22cbd052218.zip | |
- Modified the error reporting in map_freeblock_unlock so that when there's an error, the reported line number is the file's linenumber plus the object's type *10000. This is for debug information to help track down the already-freed error.
- pc_adopt will now preserve the kid's job/job-level/experience. This means that if you adopt a Swordman level 45, it will become a baby-swordman level 45, with the exact same exp as before.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8563 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/map.c b/src/map/map.c index 584415ef5..cd70167bd 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -296,7 +296,8 @@ int map_freeblock_unlock_sub(char *file, int lineno) for (i = 0; i < block_free_count; i++) { //Directly calling aFree shouldn't be a leak, as Free remembers the size the original pointed to memory was allocated with? [Skotlex] // aFree(block_free[i]); - _mfree(block_free[i], file, lineno, __func__); +// _mfree(block_free[i], file, lineno, __func__); + _mfree(block_free[i], file, block_free[i]->type*100000+lineno, __func__); block_free[i] = NULL; } block_free_count = 0; |