summaryrefslogtreecommitdiff
path: root/src/map/status.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-27 14:54:40 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-27 14:54:40 +0000
commit50e31d2860fe8f754d186a35ac1b4b61f653af5a (patch)
tree2ddbbc4bc094e98daca48f38b5130beb320d50cb /src/map/status.c
parent7e54a062e03f14bb1540f6b4ff249cf888d5ea35 (diff)
downloadhercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.gz
hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.bz2
hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.tar.xz
hercules-50e31d2860fe8f754d186a35ac1b4b61f653af5a.zip
- Pet catching now uses the menuskill variables to prevent item usage from disrupting the catch process.
- Added Safetywall to the list not blocked by Dispell. - Added some include limits.h required by window compiles. - Corrected Wedding rings being trade-able. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5772 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/status.c')
-rw-r--r--src/map/status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/status.c b/src/map/status.c
index 48534e67b..172287bce 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -5191,7 +5191,7 @@ int status_change_timer(int tid, unsigned int tick, int id, int data)
if(sc->data[type].timer != tid) {
if(battle_config.error_log)
- ShowError("status_change_timer: Mismatch for type %d: %d != %d\n",type,tid,sc->data[type].timer);
+ ShowError("status_change_timer: Mismatch for type %d: %d != %d (bl id %d)\n",type,tid,sc->data[type].timer, bl->id);
return 0;
}