summaryrefslogtreecommitdiff
path: root/world/map/npc/009-4
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2015-05-05 23:43:14 -0400
committermekolat <mekolat@users.noreply.github.com>2015-05-06 11:05:34 -0400
commit46bb91d3389c79c5375f191a7a136eb775559f99 (patch)
treef602c0c106748fbb7bd9f28c7bfa7ef81cbd2ddd /world/map/npc/009-4
parent969b8628b353e7e5bbdeaac5b4afe46a8a313e4f (diff)
downloadserverdata-46bb91d3389c79c5375f191a7a136eb775559f99.tar.gz
serverdata-46bb91d3389c79c5375f191a7a136eb775559f99.tar.bz2
serverdata-46bb91d3389c79c5375f191a7a136eb775559f99.tar.xz
serverdata-46bb91d3389c79c5375f191a7a136eb775559f99.zip
remove close builtin from functions
Diffstat (limited to 'world/map/npc/009-4')
-rw-r--r--world/map/npc/009-4/barriers.txt9
-rw-r--r--world/map/npc/009-4/torches.txt42
2 files changed, 34 insertions, 17 deletions
diff --git a/world/map/npc/009-4/barriers.txt b/world/map/npc/009-4/barriers.txt
index 4a2055fa..f629722f 100644
--- a/world/map/npc/009-4/barriers.txt
+++ b/world/map/npc/009-4/barriers.txt
@@ -15,7 +15,8 @@ L_GetBarrierColor:
L_Error:
mes "Barrier number is out of range.";
- close;
+ close2;
+ return;
L_Error2:
callfunc "SetUpOrumQuest";
@@ -35,11 +36,13 @@ function|script|SetBarrierColor
L_Error:
mes "Barrier number is out of range.";
- close;
+ close2;
+ return;
L_Error2:
mes "Barrier color is out of range.";
- close;
+ close2;
+ return;
}
diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index 4ad0c686..558e17c8 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -10,7 +10,8 @@ function|script|GetTorchColor
L_Error:
mes "Torch number is out of range.";
- close;
+ close2;
+ return;
}
function|script|SetTorchColor
@@ -24,11 +25,13 @@ function|script|SetTorchColor
L_Error:
mes "Torch number is out of range.";
- close;
+ close2;
+ return;
L_Error2:
mes "Torch color is out of range.";
- close;
+ close2;
+ return;
}
function|script|GetTorchIntensity
@@ -42,7 +45,8 @@ function|script|GetTorchIntensity
L_Error:
mes "Torch number is out of range.";
- close;
+ close2;
+ return;
}
function|script|SetTorchIntensity
@@ -56,11 +60,13 @@ function|script|SetTorchIntensity
L_Error:
mes "Torch number is out of range.";
- close;
+ close2;
+ return;
L_Error2:
mes "Torch intensity is out of range.";
- close;
+ close2;
+ return;
}
function|script|DoneWithTorches
@@ -75,12 +81,14 @@ function|script|DoneWithTorches
if (OrumQuest < 8)
mes "Without that powder the note mentions there isn't much you can do with this torch.";
- close;
+ close2;
+ goto L_Return;
L_Different:
mes "The flame on this torch looks different than the rest. You better tell Orum about it before doing anything.";
set OrumQuest, 6;
- close;
+ close2;
+ goto L_Return;
L_Return:
return;
@@ -92,7 +100,8 @@ function|script|InRangeTorch1
if (isin("009-4",67,20,69,25))
goto L_Return;
mes "You're too far away to do anything with that torch.";
- close;
+ close2;
+ goto L_Return;
L_Return:
return;
@@ -102,7 +111,8 @@ function|script|InRangeTorch2
if (isin("009-4",65,41,69,46))
goto L_Return;
mes "You're too far away to do anything with that torch.";
- close;
+ close2;
+ goto L_Return;
L_Return:
return;
@@ -112,7 +122,8 @@ function|script|InRangeTorch3
if (isin("009-4",33,84,37,88))
goto L_Return;
mes "You're too far away to do anything with that torch.";
- close;
+ close2;
+ goto L_Return;
L_Return:
return;
@@ -144,7 +155,8 @@ L_Color_Loop:
L_Leave:
mes "The flame flickers as if it's laughing at you.";
- close;
+ close2;
+ return;
L_Use_Red:
if (countitem("RedPowder") < 1)
@@ -228,7 +240,8 @@ L_Use_Blue:
L_No_Powder:
mes "You notice you're all out of that color of powder. Perhaps Orum can make you some more.";
- close;
+ close2;
+ return;
L_Color_Dec:
set @TorchColor, @TorchColor - 1;
@@ -277,7 +290,8 @@ L_Failed:
set @TorchIntensity, 0;
callfunc "SetTorchIntensity";
heal -Hp, 0;
- close;
+ close2;
+ return;
}
// First Torch