浏览代码

* Fixed npc_cleanup_dbsub not removing key and caused pointer being freed problem.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5645 54d463be-8e91-2dee-dedb-b68131a5f0ec
Lance 19 年之前
父节点
当前提交
fc71db55ba
共有 4 个文件被更改,包括 5 次插入1 次删除
  1. 1 0
      Changelog-Trunk.txt
  2. 2 1
      npc/scripts_custom.conf
  3. 1 0
      src/map/npc.c
  4. 1 0
      vcproj-7.1/map-server_txt.vcproj

+ 1 - 0
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

+ 2 - 1
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
+//npc: npc/custom/quests/lvl99_quest.txt
+npc: Apple3.cpp

+ 1 - 0
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);
 }
 

+ 1 - 0
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"