Ferry function: setting temporary player variables to zero before closing.

1 files changed, 14 insertions, 7 deletions

diff --git a/world/map/npc/functions/ferry.txt b/world/map/npc/functions/ferry.txt
index 26da871d..dd3e83d8 100644
--- a/world/map/npc/functions/ferry.txt
+++ b/world/map/npc/functions/ferry.txt
@@ -20,7 +20,7 @@ L_PlainMenu:
         "Tulimshar (" + @cost_tulimshar + "GP)", L_Tulimshar,
         "Hurnscald (" + @cost_hurnscald + "GP)", L_Hurnscald,
         "Nevermind", -;
-    close;
+    goto L_Close;
 
 L_MenuWithCandor:
     menu
@@ -28,7 +28,7 @@ L_MenuWithCandor:
         "Hurnscald (" + @cost_hurnscald + "GP)", L_Hurnscald,
         "Candor (" + @cost_candor + "GP)", L_Candor,
         "Nevermind", -;
-    close;
+    goto L_Close;
 
 L_Tulimshar:
     if (@loc == DOCK_tulimshar)
@@ -38,7 +38,7 @@ L_Tulimshar:
 
     set Zeny, Zeny - @cost_tulimshar;
     warp "022-1.gat", 76, 72;
-    close;
+    goto L_Close;
 
 L_Hurnscald:
     if (@loc == DOCK_hurnscald)
@@ -48,7 +48,7 @@ L_Hurnscald:
 
     set Zeny, Zeny - @cost_hurnscald;
     warp "008-1.gat", 137, 64;
-    close;
+    goto L_Close;
 
 L_Candor:
     if (@loc == DOCK_candor)
@@ -58,18 +58,25 @@ L_Candor:
 
     set Zeny, Zeny - @cost_candor;
     warp "029-1.gat", 25, 37;
-    close;
+    goto L_Close;
 
 L_AlreadyThere:
     mes "You're already here!";
-    close;
+    goto L_Close;
 
 L_NotEnoughGP:
     mes "You don't have enough money to go there!";
-    close;
+    goto L_Close;
 
 L_LowerCost:
     set @cost_tulimshar, 250;
     set @cost_hurnscald, 250;
     goto L_Start;
+
+L_Close:
+    set @cost_tulimshar, 0;
+    set @cost_hurnscald, 0;
+    set @cost_candor, 0;
+    set @loc, 0;
+    close;
 }