diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-04-23 14:05:20 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2009-04-23 14:05:20 +0000 |
| commit | d84ca1c320b8a4942ddc5d5cc53a20568cc8bd10 (patch) | |
| tree | 777063aa8f754c43021c88b52801469b99447540 /src/map/map.c | |
| parent | ed41067640c512709c2cdbed42241840a22ba23e (diff) | |
| download | hercules-d84ca1c320b8a4942ddc5d5cc53a20568cc8bd10.tar.gz hercules-d84ca1c320b8a4942ddc5d5cc53a20568cc8bd10.tar.bz2 hercules-d84ca1c320b8a4942ddc5d5cc53a20568cc8bd10.tar.xz hercules-d84ca1c320b8a4942ddc5d5cc53a20568cc8bd10.zip | |
Fixed several occurences of map_freeblock() being used before map_deliddb() (caused by r13503, r13505 and r13508) (bugreport:2959).
This would cause object ids (chatrooms / ground items) to never be removed when DEBUG_MEMMGR was turned on, ultimately causing a 'no free object id' fatal error.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13689 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/map.c b/src/map/map.c index d3bf14381..3222c5579 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1186,9 +1186,9 @@ int map_clearflooritem_timer(int tid, unsigned int tick, int id, intptr data) intif_delete_petdata( MakeDWord(fitem->item_data.card[1],fitem->item_data.card[2]) ); clif_clearflooritem(fitem,0); + map_deliddb(&fitem->bl); map_delblock(&fitem->bl); map_freeblock(&fitem->bl); - map_deliddb(&fitem->bl); return 0; } |