summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-01 23:26:08 +0000
committertoms <toms@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-01 23:26:08 +0000
commit1a240133d1968564e84af8e8f62bc8b34ce9e337 (patch)
tree9fed239eae1debbcd893a7fc0371a9fcc88c4221
parent7700fc12085567f4e97546c6a4d911a724a157f4 (diff)
downloadhercules-1a240133d1968564e84af8e8f62bc8b34ce9e337.tar.gz
hercules-1a240133d1968564e84af8e8f62bc8b34ce9e337.tar.bz2
hercules-1a240133d1968564e84af8e8f62bc8b34ce9e337.tar.xz
hercules-1a240133d1968564e84af8e8f62bc8b34ce9e337.zip
The "delete_timer error/no such timer" report will now print the related function
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8586 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/common/timer.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 121b2efa5..cc7c55d5c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -4,6 +4,7 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/09/01
+ * The "delete_timer error/no such timer" report will now print the related function [Toms]
* The Clearing unused stack report will now print the related NPC [Toms]
* The duplicate npc report will now print the related file name [Toms]
* Added config setting "partial_name_scan", which specifies whether @ given
diff --git a/src/common/timer.c b/src/common/timer.c
index 1e9ff25aa..d8f863059 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -263,7 +263,7 @@ int add_timer_interval(unsigned int tick, int (*func)(int,unsigned int,int,int),
int delete_timer(int id, int (*func)(int,unsigned int,int,int))
{
if (id <= 0 || id >= timer_data_num) {
- ShowError("delete_timer error : no such timer %d\n", id);
+ ShowError("delete_timer error : no such timer %d (%08x(%s))\n", id, (int)func, search_timer_func_list(func));
return -1;
}
if (timer_data[id].func != func) {