Merge pull request #370 from mekolat/close-end

remove close builtin from functions

1 files changed, 9 insertions, 5 deletions

diff --git a/world/map/npc/functions/water_bottle.txt b/world/map/npc/functions/water_bottle.txt
index b9a73740..e5f80766 100644
--- a/world/map/npc/functions/water_bottle.txt
+++ b/world/map/npc/functions/water_bottle.txt
@@ -8,7 +8,7 @@ function|script|WaterBottle
     input @count;
 
     if (@count == 0)
-        close;
+        goto L_Close;
     set @cost, @count * @COST_PER_BOTTLE;
     set @empty, countitem("EmptyBottle");
 
@@ -25,17 +25,21 @@ function|script|WaterBottle
     set Zeny, Zeny - @cost;
     delitem "EmptyBottle", @count;
     getitem "BottleOfWater", @count;
-    close;
+    goto L_Close;
 
 L_NotEnoughBottles:
     mes "You don't have that many empty bottles!";
-    close;
+    goto L_Close;
 
 L_NotEnoughMoney:
     mes "You don't have enough gp! You need " + @cost + "gp.";
-    close;
+    goto L_Close;
 
 L_NotEnoughSlots:
     mes "You don't have room for these bottles!";
-    close;
+    goto L_Close;
+
+L_Close:
+    close2;
+    return;
 }