- Added a wrapper to delete_timer so it prints out from where the invocation was done.

- Fixed some unsigned warnings.
- Fixed Splash attacks consuming 2 ammo on each attack.


git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9718 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 3 insertions, 1 deletions

diff --git a/src/common/timer.h b/src/common/timer.h
index 243b12e7d..4b683d966 100644
--- a/src/common/timer.h
+++ b/src/common/timer.h
@@ -41,7 +41,9 @@ unsigned int gettick(void);
 
 int add_timer(unsigned int,TimerFunc f,int,int);
 int add_timer_interval(unsigned int tick, TimerFunc func, int id, int data, int interval);
-int delete_timer(int,TimerFunc f);
+//int delete_timer(int,TimerFunc f);
+int delete_timer_sub(int,TimerFunc f, const char* file, int line);
+#define delete_timer(id, f) delete_timer_sub(id, f, __FILE__, __LINE__)
 
 int addtick_timer(int tid,unsigned int tick);
 int settick_timer(int tid,unsigned int tick);