Merge remote-tracking branch 'testing/master'v2011.09.08

1 files changed, 11 insertions, 10 deletions

diff --git a/world/map/npc/001-1/bernard.txt b/world/map/npc/001-1/bernard.txt
index 96c45f81..23b39f5c 100644
--- a/world/map/npc/001-1/bernard.txt
+++ b/world/map/npc/001-1/bernard.txt
@@ -25,7 +25,7 @@ L_Opening1:
 L_Ask:
     menu
         "Yes.", L_Yes,
-        "No.", L_No;
+        "No.", L_Close;
 
 L_Yes:
     set @TEMP, rand(2);
@@ -48,7 +48,7 @@ L_Set:
     set TMW_Quest,1;
     mes "[Bernard]";
     mes "\"Please bring it to me!\"";
-    close;
+    goto L_Close;
 
 L_Progress:
     if (countitem("RoastedMaggot") < 1) goto L_NotEnough;
@@ -61,7 +61,7 @@ L_Progress:
     getexp 100, 0;
     getitem "CherryCake", 5;
     set TMW_Quest, 2;
-    close;
+    goto L_Close;
 
 L_Progress2:
     if (countitem("MaggotSlime") < 3) goto L_NotEnough1;
@@ -74,17 +74,17 @@ L_Progress2:
     getexp 100, 0;
     getitem "Beer", 3;
     set TMW_Quest, 4;
-    close;
+    goto L_Close;
 
 L_NotEnough:
     mes "[Bernard]";
     mes "\"Oh, please hurry and bring me a Roasted Maggot.  I'm yearning for maggot soup!\"";
-    close;
+    goto L_Close;
 
 L_NotEnough1:
     mes "[Bernard]";
     mes "\"Please do hurry and bring me 3 Maggot Slimes, so I can finish my soup!\"";
-    close;
+    goto L_Close;
 
 L_Done1:
     mes "[Bernard]";
@@ -94,21 +94,22 @@ L_Done1:
     mes "\"I need 3 Maggot Slimes for that.\"";
     mes "\"Bring them to me, and I'll give you something nice.\"";
     set TMW_Quest,3;
-    close;
+    goto L_Close;
 
 L_Done2:
     mes "[Bernard]";
     mes "\"I didn't mention it before, but I also put beer in my soup.  I hope you like beer as much as I do, because, you see...\"";
     next;
     mes "\"Beer is life!\"";
-    close;
+    goto L_Close;
 
-L_No:
+L_Close:
+    set @TEMP, 0;
     close;
 
 L_TooMany:
     next;
     mes "[Bernard]";
     mes "\"You don't have room for my reward.  I'll wait until you do.\"";
-    close;
+    goto L_Close;
 }