diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-25 10:24:53 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-09-25 10:24:53 +0000 |
| commit | d290cfb6040d0a29c48ba42d8d6df33bec697b55 (patch) | |
| tree | b6e293e0d677d9867729be7a86ca80c248708465 | |
| parent | 57edb71dc13e63b5b62dcb2eb8d5fe43d8debba6 (diff) | |
| download | hercules-d290cfb6040d0a29c48ba42d8d6df33bec697b55.tar.gz hercules-d290cfb6040d0a29c48ba42d8d6df33bec697b55.tar.bz2 hercules-d290cfb6040d0a29c48ba42d8d6df33bec697b55.tar.xz hercules-d290cfb6040d0a29c48ba42d8d6df33bec697b55.zip | |
* 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
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/common/timer.c | 3 | ||||
| -rw-r--r-- | src/map/map.c | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 71f4eb931..b1a1b4944 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -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. 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 previous one is cancelled. [Skotlex] * Disabled tick cache (to enable it: define TICK_CACHE to the number of 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 */ |