From a5cc84660484054451ab8c912ec6fc4652eac1a0 Mon Sep 17 00:00:00 2001
From: Jessica Tölke <jtoelke@mail.upb.de>
Date: Fri, 14 Oct 2011 15:22:43 +0200
Subject: Some clean-up in gy inn npcs:

Setting all locally used temporary player variables to zero before closing.
Replacing baselevel with BaseLevel, zeny with Zeny and hp with Hp.
---
 world/map/npc/027-2/golbenez.txt | 57 ++++++++++++++++++++++++++--------------
 1 file changed, 38 insertions(+), 19 deletions(-)

(limited to 'world/map/npc/027-2/golbenez.txt')

diff --git a/world/map/npc/027-2/golbenez.txt b/world/map/npc/027-2/golbenez.txt
index 6c2b56d4..f23a6f71 100644
--- a/world/map/npc/027-2/golbenez.txt
+++ b/world/map/npc/027-2/golbenez.txt
@@ -78,13 +78,13 @@
     set @state, 1;
     callsub S_Update_Mask;
 
-    close;
+    goto L_Close;
 
 L_Back:
     if (@lover >= 3)
         goto L_Memory;
     mes "Golbenez decides to ignore your presence.";
-    close;
+    goto L_Close;
 
 L_Memory:
     mes "[Golbenez]";
@@ -98,7 +98,7 @@ L_Memory:
             goto L_Detective;
     mes "[Golbenez]";
     mes "\"I was watching you playing detective. It is amusing. Play it a little longer and I may show you some of the memories from that time.\"";
-    close;
+    goto L_Close;
 
 L_Detective:
     mes "[Golbenez]";
@@ -118,7 +118,7 @@ L_Detective:
     mes "\"Ok, I'll show you the birdbrained womans memories if you bring me " + @ROTTENRAGS_AMOUNT + " Rotten Rags. And an Orange Cake.\"";
     set @state, 2;
     callsub S_Update_Mask;
-    close;
+    goto L_Close;
 
 L_Reid:
     mes "[Golbenez]";
@@ -156,7 +156,7 @@ L_Reid:
     mes "\"I'll explain the deal to you. Once you have paid for a memory, you can come and see it again as often as you like. And I collect whatever memory I want to. Mortals can be very amusing.\"";
     next;
     mes "\"I have more memories you might want to see. Bring me "+ @UNDEADEAR_AMOUNT + " Undead Ears. And a Chocolate Cake.\"";
-    close;
+    goto L_Close;
 
 L_Hamond:
     mes "[Golbenez]";
@@ -190,7 +190,7 @@ L_Hamond:
     mes "\"And how predictable they are. I can see in your eyes that you want to know how this drama went on.\"";
     next;
     mes "\"Bring me " + @UNDEADEYE_AMOUNT + " Undead Eyes and an Apple Cake.\"";
-    close;
+    goto L_Close;
 
 L_Savaric:
     mes "[Golbenez]";
@@ -228,7 +228,7 @@ L_Savaric:
     mes "Golbenez smiles";
     mes "[Golbenez]";
     mes "\"Oh, thank you.\"";
-    close;
+    goto L_Close;
 
 L_All:
     if (@lover == 6)
@@ -240,7 +240,7 @@ L_All:
         "I want to see Hamonds memory again.",L_H_Again,
         "I want to see Savarics memory again.",L_S_Again,
         "Nevermind.",L_Close;
-    close;
+    goto L_Close;
 
 L_Negotiate:
     mes "Golbenez eyes are glowing greedily";
@@ -265,7 +265,7 @@ L_Negotiate:
     mes "\"Bring me a soul of at least equal power to the mage. I don't care where you get it.\"";
     set @state, 6;
     callsub S_Update_Mask;
-    close;
+    goto L_Close;
 
 L_Soul:
     mes "[Golbenez]";
@@ -297,59 +297,78 @@ L_Soul_Success:
     mes "\"So be it, mortal. I'll release Savarics soul in exchange for this one.\"";
     set @state, 7;
     callsub S_Update_Mask;
-    close;
+    goto L_Close;
 
 L_Done:
     mes "[Golbenez]";
     mes "\"I hope you enjoyed your little detective game. I certainly did.\"";
-    close;
+    goto L_Close;
 
 L_Cake:
     mes "Golbenez laughs.";
     mes "[Golbenez]";
     mes "\"That's why I like you - also you're a human, you have a nice sense of humor.\"";
-    close;
+    goto L_Close;
 
 L_S_Again:
     callsub S_Savaricsmem;
     mes "[Golbenez]";
     mes "\"What a fool he was, even for a human.\"";
-    close;
+    goto L_Close;
 
 L_R_Again:
     callsub S_Reidsmem;
     mes "\"This memory seems to be exciting to you. Interesting.\"";
-    close;
+    goto L_Close;
 
 L_H_Again:
     callsub S_Hamondsmem;
     mes "[Golbenez]";
     mes "\"Humans can be so stupid, can't they?\"";
-    close;
+    goto L_Close;
 
 L_Horns:
     mes "Golbenez bursts out with laughter.";
     next;
     mes "[Golbenez]";
     mes "\"Mortals! They never stop surprising me.\"";
-    close;
+    goto L_Close;
 
 L_Why_Stuff:
     mes "[Golbenez]";
     mes "\"That is not your concern.\"";
-    close;
+    goto L_Close;
 
 L_Betray:
     mes "[Golbenez]";
     mes "\"I'm warning you, mortal. Don't try to betray me!\"";
-    close;
+    goto L_Close;
 
 L_No_Cake:
     mes "[Golbenez]";
     mes "\"Fool! You forgot my cake!\"";
-    close;
+    goto L_Close;
 
 L_Close:
+    set @Graveyard_Inn_MASK, 0;
+    set @Graveyard_Inn_SHIFT, 0;
+    set @state, 0;
+    set @Graveyard_Inn_Woman_MASK, 0;
+    set @Graveyard_Inn_Woman_SHIFT, 0;
+    set @woman, 0;
+    set @Graveyard_Inn_Lover_MASK, 0;
+    set @Graveyard_Inn_Lover_SHIFT, 0;
+    set @lover, 0;
+    set @Graveyard_Inn_Husband_MASK, 0;
+    set @Graveyard_Inn_Husband_SHIFT, 0;
+    set @husband, 0;
+    set @ROTTENRAGS_AMOUNT, 0;
+    set @ROTTENRAGS_EXP, 0;
+    set @UNDEADEAR_AMOUNT, 0;
+    set @UNDEADEAR_EXP, 0;
+    set @UNDEADEYE_AMOUNT, 0;
+    set @UNDEADEYE_EXP, 0;
+    set @soul, 0;
     close;
 
 S_Reidsmem:
-- 
cgit v1.2.3-70-g09d2