From d290cfb6040d0a29c48ba42d8d6df33bec697b55 Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Tue, 25 Sep 2007 10:24:53 +0000 Subject: * Fixed the double free's caused by r11290 (wrong option in the database constructors). Readded tick cache variables (deleted by mistake). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11292 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/timer.c | 3 +++ src/map/map.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/common/timer.c b/src/common/timer.c index a24e2da8f..996ec98a8 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -114,6 +114,9 @@ char* search_timer_func_list(TimerFunc func) #if defined(TICK_CACHE) && TICK_CACHE > 1 ////////////////////////////////////////////////////////////////////////// // tick is cached for TICK_CACHE calls +static unsigned int gettick_cache; +static int gettick_count; + unsigned int gettick_nocache(void) { #ifdef WIN32 diff --git a/src/map/map.c b/src/map/map.c index 9fc3d9fca..a60e059b4 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -3400,8 +3400,8 @@ int do_init(int argc, char *argv[]) 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] 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)); - charid_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_BASE,sizeof(int)); #ifndef TXT_ONLY map_sql_init(); #endif /* not TXT_ONLY */ -- cgit v1.2.3-70-g09d2