summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-07 17:59:25 +0000
committerFlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-01-07 17:59:25 +0000
commit8fd7ea9e4f38bd02b99e4fa42fc2003390a25adc (patch)
tree3298beebedd59756a671560128b7ce1e4d9b78ea /src/common
parentf11b8f4bb3b1c047e0b1dfc9585f5b6c49ee8f65 (diff)
downloadhercules-8fd7ea9e4f38bd02b99e4fa42fc2003390a25adc.tar.gz
hercules-8fd7ea9e4f38bd02b99e4fa42fc2003390a25adc.tar.bz2
hercules-8fd7ea9e4f38bd02b99e4fa42fc2003390a25adc.tar.xz
hercules-8fd7ea9e4f38bd02b99e4fa42fc2003390a25adc.zip
- Fixed the sleep timers not being removed when the an npc was being unloaded and when reloading scripts.
Ref: http://www.eathena.ws/board/index.php?showtopic=131464 git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9629 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
-rw-r--r--src/common/timer.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/common/timer.h b/src/common/timer.h
index 7184beec5..243b12e7d 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -18,6 +18,8 @@
#define DIFF_TICK(a,b) ((int)((a)-(b)))
+#define INVALID_TIMER -1
+
// Struct declaration
typedef int (*TimerFunc)(int,unsigned int,int,int);
@@ -38,7 +40,7 @@ unsigned int gettick_nocache(void);
unsigned int gettick(void);
int add_timer(unsigned int,TimerFunc f,int,int);
-int add_timer_interval(unsigned int,TimerFunc f,int,int,int);
+int add_timer_interval(unsigned int tick, TimerFunc func, int id, int data, int interval);
int delete_timer(int,TimerFunc f);
int addtick_timer(int tid,unsigned int tick);