summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/timer.c3
-rw-r--r--src/map/map.c4
2 files changed, 5 insertions, 2 deletions
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 */