From 46bb91d3389c79c5375f191a7a136eb775559f99 Mon Sep 17 00:00:00 2001 From: mekolat Date: Tue, 5 May 2015 23:43:14 -0400 Subject: remove close builtin from functions --- world/map/npc/annuals/xmas/barriers.txt | 8 ++++++-- world/map/npc/annuals/xmas/debug.txt | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'world/map/npc/annuals/xmas') diff --git a/world/map/npc/annuals/xmas/barriers.txt b/world/map/npc/annuals/xmas/barriers.txt index 5dd30774..3e6aad65 100644 --- a/world/map/npc/annuals/xmas/barriers.txt +++ b/world/map/npc/annuals/xmas/barriers.txt @@ -4,6 +4,7 @@ function|script|ThrowOutTheBum { + set @getout, 0; if((@xmas_thrown_out) && ($@xmas_time)) goto L_SideOut; goto L_Return; @@ -18,13 +19,16 @@ L_Hint: mes "[Orum's Homunculus]"; mes "\"What are you doing? Come, see me in the caves below!\""; mes "\"I said go north till you reach the snowman. Then head into the cave to the east.\""; + close2; warp "020-1.gat",33,94; - close; + set @getout, 1; + goto L_Return; L_Warp: message strcharinfo(0), "I said get out, We've no time for your kind here."; warp "020-1.gat",33,94; - end; + set @getout, 1; + goto L_Return; L_Return: return; diff --git a/world/map/npc/annuals/xmas/debug.txt b/world/map/npc/annuals/xmas/debug.txt index 0e3c38a2..d67c3de8 100644 --- a/world/map/npc/annuals/xmas/debug.txt +++ b/world/map/npc/annuals/xmas/debug.txt @@ -168,7 +168,8 @@ L_Close: set @xmas_time_key_rsday, 0; set @xmas_time_key_reday, 0; set @xmas_time_key_year, 0; - close; + close2; + return; } 020-1.gat,86,76,0|script|XmasDebug#1|105 -- cgit v1.2.3-60-g2f50