a few fixes/modifications here and there

1 files changed, 6 insertions, 38 deletions

diff --git a/world/map/npc/009-4/torches.txt b/world/map/npc/009-4/torches.txt
index 558e17c8..0164acd4 100644
--- a/world/map/npc/009-4/torches.txt
+++ b/world/map/npc/009-4/torches.txt
@@ -94,41 +94,6 @@ L_Return:
     return;
 }
 
-// To make sure in range of torches
-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.";
-    close2;
-    goto L_Return;
-
-L_Return:
-    return;
-}
-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.";
-    close2;
-    goto L_Return;
-
-L_Return:
-    return;
-}
-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.";
-    close2;
-    goto L_Return;
-
-L_Return:
-    return;
-}
-
 function|script|TorchLoop
 {
     // Variables used here:
@@ -297,7 +262,8 @@ L_Failed:
 // First Torch
 009-4,68,21,0|script|Torch#1|400
 {
-    callfunc "InRangeTorch1";
+    callfunc "PCtoNPCRange";
+    if(@npc_check) end;
     callfunc "DoneWithTorches";
 
     set @Torch, 0;
@@ -309,7 +275,8 @@ L_Failed:
 // Second Torch
 009-4,67,42,0|script|Torch#2|400
 {
-    callfunc "InRangeTorch2";
+    callfunc "PCtoNPCRange";
+    if(@npc_check) end;
     callfunc "DoneWithTorches";
 
     set @Torch, 1;
@@ -321,7 +288,8 @@ L_Failed:
 // Third Torch
 009-4,33,86,0|script|Torch#3|400
 {
-    callfunc "InRangeTorch3";
+    callfunc "PCtoNPCRange";
+    if(@npc_check) end;
     callfunc "DoneWithTorches";
 
     set @Torch, 2;