From 43cc789c05999bed1e50126867887212bc1fc346 Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Wed, 16 Jul 2008 10:34:16 +0000 Subject: * Added a check to make sure only released timers are acquired from the free list. * Changed TIMER_MAX_INTERVAL to 1 second (was set to 1 minute by mistake). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12963 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/common/timer.c') diff --git a/src/common/timer.c b/src/common/timer.c index df227cb57..882ddd705 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -22,7 +22,7 @@ // If the server can't handle processing thousands of monsters // or many connected clients, please increase TIMER_MIN_INTERVAL. #define TIMER_MIN_INTERVAL 50 -#define TIMER_MAX_INTERVAL 60000 +#define TIMER_MAX_INTERVAL 1000 // timers (array) static struct TimerData* timer_data = NULL; @@ -324,8 +324,8 @@ static int acquire_timer(void) while( free_timer_list_num ) { int pos = --free_timer_list_num; - if( free_timer_list[pos] < timer_data_num ) - { + if( free_timer_list[pos] < timer_data_num && timer_data[free_timer_list[pos]].type == 0 ) + {// freed and released tid = free_timer_list[pos]; break; } -- cgit v1.2.3-60-g2f50