From 1c495a071e907286ebe929dec9a8ead8582aee82 Mon Sep 17 00:00:00 2001 From: AnnieRuru Date: Mon, 17 Mar 2014 02:20:57 +0800 Subject: Fix WoE:SE guild flag doesn't change emblem Fix bug 8077 http://hercules.ws/board/tracker/issue-8077-woese-flag-emblems-gives-warning/ --- npc/guild2/agit_main_se.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"; -- cgit v1.2.3-70-g09d2 From 18278c253f08f5c8b26a1634a7c6c5efff8ee4b5 Mon Sep 17 00:00:00 2001 From: AnnieRuru Date: Mon, 17 Mar 2014 02:53:54 +0800 Subject: Fix addtimer will report error when hit MAX_EVENTTIMER Fix bug 7965 http://hercules.ws/board/tracker/issue-7965- --- src/map/script.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/map/script.c b/src/map/script.c index 5a33a39ed..09a6f7bd2 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -9273,7 +9273,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; } /*========================================== -- cgit v1.2.3-70-g09d2