diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-20 02:36:23 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-07-20 02:36:23 +0000 |
| commit | 2ef4626858ce45f40848beb9ee08f50baedb85e4 (patch) | |
| tree | 7139110805d4afef3289b82b94ae54db67b661de | |
| parent | 1bf17bc6fdf7ce3cf037b9c56d61da82f5956aab (diff) | |
| download | hercules-2ef4626858ce45f40848beb9ee08f50baedb85e4.tar.gz hercules-2ef4626858ce45f40848beb9ee08f50baedb85e4.tar.bz2 hercules-2ef4626858ce45f40848beb9ee08f50baedb85e4.tar.xz hercules-2ef4626858ce45f40848beb9ee08f50baedb85e4.zip | |
ops ('|'->'&' in delete_timer debug code)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12969 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/common/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |