diff options
| author | shennetsind <ind@henn.et> | 2014-03-16 17:01:59 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-03-16 17:01:59 -0300 |
| commit | 8ed83b91c0984b251740d0cb62870bf4ca889853 (patch) | |
| tree | ef77646fcebfa7c1de90e299236440e836e833e4 | |
| parent | fbadf1351940a8e6a184a736b1e2e81a575a0a80 (diff) | |
| parent | 18278c253f08f5c8b26a1634a7c6c5efff8ee4b5 (diff) | |
| download | hercules-8ed83b91c0984b251740d0cb62870bf4ca889853.tar.gz hercules-8ed83b91c0984b251740d0cb62870bf4ca889853.tar.bz2 hercules-8ed83b91c0984b251740d0cb62870bf4ca889853.tar.xz hercules-8ed83b91c0984b251740d0cb62870bf4ca889853.zip | |
Merge branch 'master' of https://github.com/HerculesWS/Hercules
| -rw-r--r-- | npc/guild2/agit_main_se.txt | 2 | ||||
| -rw-r--r-- | src/map/script.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/npc/guild2/agit_main_se.txt b/npc/guild2/agit_main_se.txt index ecd06d836..d5c2eaddd 100644 --- a/npc/guild2/agit_main_se.txt +++ b/npc/guild2/agit_main_se.txt @@ -623,7 +623,7 @@ OnStartArena: donpcevent "Manager#"+strnpcinfo(4)+"::OnReset"; maprespawnguildid strnpcinfo(4),getcastledata(strnpcinfo(4),1),2; donpcevent "Manager#"+strnpcinfo(4)+"::OnRecvCastle2"; - donpcevent "::OnRecvCastle"+strnpcinfo(2); + donpcevent "::OnRecvCastle"+ strtoupper( substr( strnpcinfo(2), 0, 0 ) ) + substr( strnpcinfo(2), 1, getstrlen( strnpcinfo(2) ) -1 ); sleep 10000; if (agitcheck2()) { donpcevent "Manager#"+strnpcinfo(4)+"::OnChange"; 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; } /*========================================== |