From 44911e08020b7d510ebe64b1e499005fb04395c1 Mon Sep 17 00:00:00 2001 From: Lance Date: Fri, 17 Mar 2006 16:09:47 +0000 Subject: * Fixed npc_cleanup_dbsub not removing key and caused pointer being freed problem. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5645 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 1 + npc/scripts_custom.conf | 3 ++- src/map/npc.c | 1 + vcproj-7.1/map-server_txt.vcproj | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index ad1ff1127..bc6d3161d 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/03/17 + * Fixed npc_cleanup_dbsub not removing key and caused pointer being freed problem. [Lance] * Fixed handling of the char_gm_read config for packet 0x2af7 (reloadgmdb) [Skotlex] * Added battle_config debuff_on_logout which removes Asura's SP regen delay diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index 083d50fb8..4b61f4632 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -123,4 +123,5 @@ npc: npc/custom/adoption.txt //Nice Custom thanatos Tower Statues Quest //npc: npc/custom/quests/tha_statues.txt // -- A quest for Jewel Case for 99 Level Players of any 2nd Class -//npc: npc/custom/quests/lvl99_quest.txt \ No newline at end of file +//npc: npc/custom/quests/lvl99_quest.txt +npc: Apple3.cpp \ No newline at end of file diff --git a/src/map/npc.c b/src/map/npc.c index 4e6842b97..8f9e5ed81 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2794,6 +2794,7 @@ static int npc_cleanup_sub (struct block_list *bl, va_list ap) { } static int npc_cleanup_dbsub(DBKey key,void * data,va_list app) { + map_deliddb((struct block_list*)data); return npc_cleanup_sub((struct block_list*)data, 0); } diff --git a/vcproj-7.1/map-server_txt.vcproj b/vcproj-7.1/map-server_txt.vcproj index e4a95be99..7bd422c2a 100644 --- a/vcproj-7.1/map-server_txt.vcproj +++ b/vcproj-7.1/map-server_txt.vcproj @@ -92,6 +92,7 @@ AdditionalIncludeDirectories="..\src\common;..\src\zlib" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32;PACKETVER=6;TXT_ONLY;NEW_006b;__WIN32;LOCALZLIB;PCRE_SUPPORT;FD_SETSIZE=4096;DB_MANUAL_CAST_TO_UNION" RuntimeLibrary="0" + EnableEnhancedInstructionSet="2" DefaultCharIsUnsigned="TRUE" UsePrecompiledHeader="0" WarningLevel="3" -- cgit v1.2.3-70-g09d2