Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed the double free's caused by r11290 (wrong option in the database constructors).

Browse Source 
Readded tick cache variables (deleted by mistake).


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11292 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
FlavioJS 2007-09-25 10:24:53 +00:00
parent 76ece51877
commit 62ea9e001e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog-Trunk.txt
View File

@ -4,6 +4,8 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2007/09/25 2007/09/25
* Fixed the double free's caused by r11290 (wrong option in the database
constructors). [FlavioJS]
* Corrected being able to cast multiple Gravitation Fields before the * Corrected being able to cast multiple Gravitation Fields before the
previous one is cancelled. [Skotlex] previous one is cancelled. [Skotlex]
* Disabled tick cache (to enable it: define TICK_CACHE to the number of * Disabled tick cache (to enable it: define TICK_CACHE to the number of

3
src/common/timer.c
View File

@ -114,6 +114,9 @@ char* search_timer_func_list(TimerFunc func)
#if defined(TICK_CACHE) && TICK_CACHE > 1 #if defined(TICK_CACHE) && TICK_CACHE > 1
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// tick is cached for TICK_CACHE calls // tick is cached for TICK_CACHE calls
static unsigned int gettick_cache;
static int gettick_count;
unsigned int gettick_nocache(void) unsigned int gettick_nocache(void)
{ {
#ifdef WIN32 #ifdef WIN32

4
src/map/map.c
View File

@ -3400,8 +3400,8 @@ int do_init(int argc, char *argv[])
id_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); id_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int));
pc_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); //Added for reliable map_id2sd() use. [Skotlex] pc_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); //Added for reliable map_id2sd() use. [Skotlex]
map_db = db_alloc(__FILE__,__LINE__,DB_UINT,DB_OPT_BASE,sizeof(int)); map_db = db_alloc(__FILE__,__LINE__,DB_UINT,DB_OPT_BASE,sizeof(int));
nick_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); nick_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int));
charid_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); charid_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int));
#ifndef TXT_ONLY #ifndef TXT_ONLY
map_sql_init(); map_sql_init();
#endif /* not TXT_ONLY */ #endif /* not TXT_ONLY */