summaryrefslogtreecommitdiff
path: root/world/map/npc/006-1
diff options
context:
space:
mode:
authorWushin <pasekei@gmail.com>2015-05-11 21:53:16 -0500
committerWushin <pasekei@gmail.com>2015-05-11 21:53:16 -0500
commitda0f4578b83cc2f9df249dc1bb5bb33d720cb7a8 (patch)
treee832bd72654a02f5deb41380d494e4e50474f050 /world/map/npc/006-1
parent666512014d1a7929d511403c47fc4e49420c5423 (diff)
parent46bb91d3389c79c5375f191a7a136eb775559f99 (diff)
downloadserverdata-da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8.tar.gz
serverdata-da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8.tar.bz2
serverdata-da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8.tar.xz
serverdata-da0f4578b83cc2f9df249dc1bb5bb33d720cb7a8.zip
Merge pull request #370 from mekolat/close-end
remove close builtin from functions
Diffstat (limited to 'world/map/npc/006-1')
-rw-r--r--world/map/npc/006-1/spirit.txt8
-rw-r--r--world/map/npc/006-1/tree.txt8
2 files changed, 8 insertions, 8 deletions
diff --git a/world/map/npc/006-1/spirit.txt b/world/map/npc/006-1/spirit.txt
index ef88d7d7..ecf3a4b1 100644
--- a/world/map/npc/006-1/spirit.txt
+++ b/world/map/npc/006-1/spirit.txt
@@ -4,7 +4,7 @@ function|script|EarthImpTouch
mes "[Well]";
mes "You hear noises from within the well.";
- close;
+ return;
L_message:
set @Q_MASK, NIBBLE_0_MASK;
@@ -279,7 +279,7 @@ L_Close:
set @Q_STATUS_STUDENT2, 0;
set @Q_STATUS_STUDENT3, 0;
set @s$, "";
- close;
+ return;
S_update_var:
set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT));
@@ -289,11 +289,11 @@ S_update_var:
006-1,63,79,0|script|#EarthImp0#_M|400
{
callfunc "EarthImpTouch";
- end;
+ close;
}
006-1,64,79,0|script|#EarthImp1#_M|400
{
callfunc "EarthImpTouch";
- end;
+ close;
}
diff --git a/world/map/npc/006-1/tree.txt b/world/map/npc/006-1/tree.txt
index ecbc3584..6740312e 100644
--- a/world/map/npc/006-1/tree.txt
+++ b/world/map/npc/006-1/tree.txt
@@ -39,7 +39,7 @@ L_Close:
set @Q_status_lower, 0;
set @Q_wr_status, 0;
set @value, 0;
- close;
+ return;
S_update_var:
set @Q_wr_status, (@Q_status << 2) | @Q_status_lower;
@@ -151,18 +151,18 @@ L_Close:
set @Q_MASK, 0;
set @Q_SHIFT, 0;
set @Q_status, 0;
- close;
+ return;
}
006-1,82,59,0|script|#DruidTree0#_M|400
{
callfunc "QuestTreeTouch";
- end;
+ close;
}
006-1,83,59,0|script|#DruidTree1#_M|400
{
callfunc "QuestTreeTouch";
- end;
+ close;
}