summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2014-03-16 17:01:59 -0300
committershennetsind <ind@henn.et>2014-03-16 17:01:59 -0300
commit8ed83b91c0984b251740d0cb62870bf4ca889853 (patch)
treeef77646fcebfa7c1de90e299236440e836e833e4 /src/map
parentfbadf1351940a8e6a184a736b1e2e81a575a0a80 (diff)
parent18278c253f08f5c8b26a1634a7c6c5efff8ee4b5 (diff)
downloadhercules-8ed83b91c0984b251740d0cb62870bf4ca889853.tar.gz
hercules-8ed83b91c0984b251740d0cb62870bf4ca889853.tar.bz2
hercules-8ed83b91c0984b251740d0cb62870bf4ca889853.tar.xz
hercules-8ed83b91c0984b251740d0cb62870bf4ca889853.zip
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Diffstat (limited to 'src/map')
-rw-r--r--src/map/script.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/map/script.c b/src/map/script.c
index 6bd215752..17eba6b21 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -9285,7 +9285,10 @@ BUILDIN(addtimer)
if( sd == NULL )
return true;
- pc->addeventtimer(sd,tick,event);
+ if (!pc->addeventtimer(sd,tick,event)) {
+ ShowWarning("buildin_addtimer: Event timer is full, can't add new event timer. (cid:%d timer:%s)\n",sd->status.char_id,event);
+ return false;
+ }
return true;
}
/*==========================================