diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-26 18:49:46 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-01-26 18:49:46 +0000 |
| commit | 66b2cadb9bcb6ad125cb18cdbea903a63ad0d925 (patch) | |
| tree | d5fbc354d0db815d28c71e31f8e48b7e272d3ac4 /src/common/timer.c | |
| parent | 7924f0a9251dba9dbd7acae7d6bff3cb8610ab9b (diff) | |
| download | hercules-66b2cadb9bcb6ad125cb18cdbea903a63ad0d925.tar.gz hercules-66b2cadb9bcb6ad125cb18cdbea903a63ad0d925.tar.bz2 hercules-66b2cadb9bcb6ad125cb18cdbea903a63ad0d925.tar.xz hercules-66b2cadb9bcb6ad125cb18cdbea903a63ad0d925.zip | |
- 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
Diffstat (limited to 'src/common/timer.c')
| -rw-r--r-- | src/common/timer.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/timer.c b/src/common/timer.c index c7be0ab8f..6c228839c 100644 --- a/src/common/timer.c +++ b/src/common/timer.c @@ -270,10 +270,12 @@ int add_timer_interval(unsigned int tick, TimerFunc func, int id, int data, int return tid; } -int delete_timer(int id, TimerFunc func) +//int delete_timer(int id, TimerFunc func) +int delete_timer_sub(int id, TimerFunc func, const char* file, int line) { if (id <= 0 || id >= timer_data_num) { - ShowError("delete_timer error : no such timer %d (%08x(%s))\n", id, (int)func, search_timer_func_list(func)); + //ShowError("delete_timer error : no such timer %d (%08x(%s))\n", id, (int)func, search_timer_func_list(func)); + ShowError("delete_timer error : no such timer %d (%08x(%s)), invoked from %s:%d\n", id, (int)func, search_timer_func_list(func), file, line); return -1; } if (timer_data[id].func != func) { |