From 2ef4626858ce45f40848beb9ee08f50baedb85e4 Mon Sep 17 00:00:00 2001 From: FlavioJS Date: Sun, 20 Jul 2008 02:36:23 +0000 Subject: ops ('|'->'&' in delete_timer debug code) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12969 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common/timer.c') diff --git a/src/common/timer.c b/src/common/timer.c index 84380c9f9..b26282403 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -436,7 +436,7 @@ int delete_timer(int tid, TimerFunc func) timer_data[tid].type = TIMER_FORCE_REMOVE|TIMER_REMOVE_HEAP; else if( pop_timer_heap(tid) ) release_timer(tid); - else if( (timer_data[tid].type|TIMER_REMOVE_HEAP) == 0 ) + else if( (timer_data[tid].type&TIMER_REMOVE_HEAP) == 0 ) ShowDebug("delete_timer: failed to remove timer %d (%08x(%s), type=%d)\n", tid, (int)func, search_timer_func_list(func), timer_data[tid].type); return 0; } -- cgit v1.2.3-60-g2f50