Clear Temporary variables after you close npc window. Npcs from maps 001-2, 002-1 and 003-1.

3 files changed, 66 insertions, 28 deletions

diff --git a/world/map/npc/001-2/casino.txt b/world/map/npc/001-2/casino.txt
index 9dcbf5c5..1ee4770a 100644
--- a/world/map/npc/001-2/casino.txt
+++ b/world/map/npc/001-2/casino.txt
@@ -22,7 +22,7 @@
 }
 
 001-2.gat,32,67,0|script|MoneyChanger|124,{
-    mes "[" + @npcname$ + "]";
+    mes "[Money Changer]";
     mes "\"I used to exchange Casino Coins for cash, but the Wizard's Council shut me down.  Now the casino only runs off Casino Coins currently in circulation.\"";
     next;
     mes "\"I heard that many a gambler wandered onto the Beach to the South West and through to the Snake Desert to the South East.  If you want to find coins already in circulation, you might find some on the monsters there.\"";
@@ -38,7 +38,7 @@
         "Yes", L_Begin,
         "No", -;
     mes "\"As you wish.\"";
-    close;
+    goto L_Close;
 
 L_Begin:
     if(countitem("CasinoCoins") < 15) goto L_NoCoin;
@@ -73,17 +73,17 @@ L_End:
     mes "I had " + @croupier + ".";
     mes "You get 45 casino coins.\"";
     getitem "CasinoCoins", 45;
-    close;
+    goto L_Close;
 
 L_NoCoin:
     mes "\"You need at least 15 coins.\"";
-    close;
+    goto L_Close;
 
 L_Lost:
     mes "\"I'm sorry but you lost.";
     mes "You got " + @player + " with your cards.";
     mes "I had " + @croupier + ".\"";
-    close;
+    goto L_Close;
 
 L_Ace:
     set @player, @player + 11;
@@ -96,6 +96,11 @@ L_Ace:
     menu
         "Yes", L_Another,
         "No", L_End;
+
+L_Close:
+    set @croupier, 0;
+    set @player, 0;
+    set @tempace, 0;
     close;
 }
 
@@ -111,7 +116,7 @@ L_Ace:
         "100 coins", L_b100,
         "Maybe I'll play later", -;
     mes "Come again.";
-    close;
+    goto L_Close;
 
 L_b1:
     set @bet, 1;
@@ -146,7 +151,7 @@ L_Check:
     if(@color == 1) goto L_Lost;
     mes "You won!";
     getitem "CasinoCoins", @bet * 2;
-    close;
+    goto L_Close;
 
 L_Number:
     menu
@@ -165,13 +170,20 @@ L_Number:
     if (@number != @roulette) goto L_Lost;
     mes "\"You won!\"";
     getitem "CasinoCoins", @bet * 10;
-    close;
+    goto L_Close;
 
 L_NoCoin:
     mes "\"You don't have enough coins.\"";
-    close;
+    goto L_Close;
 
 L_Lost:
     mes "\"I'm sorry, you lost.\"";
+    goto L_Close;
+
+L_Close:
+    set @number, 0;
+    set @roulette, 0;
+    set @color, 0;
+    set @bet, 50;
     close;
 }
diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt
index 37bd3307..5e786d83 100644
--- a/world/map/npc/001-2/omar.txt
+++ b/world/map/npc/001-2/omar.txt
@@ -39,12 +39,12 @@ function|script|KadiyaSubquestConsts|{
         "Well met!  May I ask who you are?", L_omar,
         "What's wrong with your daughter?", L_kadiya_sick,
         "Thank you!", -;
-    close;
+    goto L_Close;
 
 L_omar:
     mes "[Omar]";
     mes "\"My name is Omar;  I am a trader of oils and spices.\"";
-    close;
+    goto L_Close;
 
 L_kadiya_sick:
     mes "[Omar]";
@@ -61,24 +61,24 @@ L_kadiya_sick:
     mes "[Omar]";
     mes "\"Well, she is a strong girl.  I am sure that she will get over it eventually.\"";
     mes "He smiles, but you see doubt in his eyes.";
-    close;
+    goto L_Close;
 
 L_sick_elanore:
     mes "[Omar]";
     mes "\"Elanore?\"";
     mes "He frowns.";
     mes "\"She knows nothing.  I see no point in talking to her.\"";
-    close;
+    goto L_Close;
 
 L_sick_hospital:
     mes "[Omar]";
     mes "\"Hurnscald is too far away.  I don't think that it would be good for her to go on such a long trip.\"";
-    close;
+    goto L_Close;
 
 L_sick_self:
     mes "[Omar]";
     mes "\"You are very kind, but I don't think there is anything you can do.\"";
-    close;
+    goto L_Close;
 
 L_didnt_drink:
     mes "[Omar]";
@@ -95,7 +95,7 @@ L_didnt_drink:
         mes "\"If only we could make it smell and taste like orange cupcakes...  she really loves those cupcakes.\"";
     if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE)
         mes "\"If only this were a chocolate cake and not a potion... she really loves chocolate cakes.\"";
-    close;
+    goto L_Close;
 
 L_make_food:
     mes "[Omar]";
@@ -104,13 +104,13 @@ L_make_food:
         mes "\"Alas, it is not an orange cupcake.\"";
     if (@Q_status == @Q_STATUS_WANTS_CHOCOCAKE)
         mes "\"If only it were to smell and taste like her favourite chocolate cake...\"";
-    close;
+    goto L_Close;
 
 L_cured:
     if (@Q_status == @Q_STATUS_COMPLETED) goto L_cured_choice;
     mes "[Omar]";
     mes "\"She is sleeping now, but she seems to be much better.  I am sure that she will be up and running around again soon.\"";
-    close;
+    goto L_Close;
 
 L_cured_choice:
     mes "[Omar]";
@@ -127,7 +127,7 @@ L_cured_choice:
     set @Q_status, @Q_STATUS_COMPLETED_NOELANORE;
     callsub S_update_var;
     set zeny, zeny + 5000;
-    close;
+    goto L_Close;
 
 L_cured_nothing:
     mes "[Omar]";
@@ -138,7 +138,7 @@ L_cured_nothing:
     callsub S_update_var;
     getitem "Pearl", 2;
     set zeny, zeny + 10000;
-    close;
+    goto L_Close;
 
 L_cured_elanore:
     mes "[Omar]";
@@ -153,7 +153,7 @@ L_cured_elanore:
     next;
     set @Q_status, @Q_STATUS_COMPLETED_ELANORE;
     callsub S_update_var;
-    close;
+    goto L_Close;
 
 S_update_var:
     set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(NIBBLE_3_MASK) | (@Q_status << NIBBLE_3_SHIFT));
@@ -224,19 +224,19 @@ L_M_no_cupcake:
     if (@choice == @M_POTION) goto L_potion;
     if (@choice == @M_CHOCOCAKE) goto L_chococake;
     if (@choice == @M_CUPCAKE) goto L_cupcake;
-    close;
+    goto L_Close;
 
 L_name:
     mes "[Kadiya]";
     mes "She smiles a faint smile.";
     mes "\"My name is Kadiya.\"";
-    close;
+    goto L_Close;
 
 L_no_candy:
     mes "[Kadiya]";
     mes "She hesitates for a moment.";
     mes "\"No, thank you.  I don't think I should.\"";
-    close;
+    goto L_Close;
 
 L_potion:
     mes "[Kadiya]";
@@ -249,8 +249,7 @@ L_potion:
     mes "[Kadiya]";
     mes "She pulls the sheets over her head.";
     mes "\"I won't drink that!\"";
-    next;
-    close;
+    goto L_Close;
 
 L_chococake:
     delitem "LacedChocolateCake", 1;
@@ -282,16 +281,41 @@ L_do_cure:
     next;
     mes "[Kadiya]";
     mes "\"You should get some sleep now, sweetheart.  I'm sure that you will be better soon.\"";
-    close;
+    goto L_Close;
 
 L_goodbye:
     mes "[Kadiya]";
     mes "Goodbye!";
-    close;
+    goto L_Close;
 
 L_cured:
     mes "[Kadiya]";
     mes "Kadiya seems to be sleeping calmly.  She looks much less sweaty than earlier; unless you are very much mistaken, her fever has disappeared.";
+    goto L_Close;
+
+L_Close:
+    set @Q_STATUS_KNOWS_MOPOX, 1;
+    set @Q_STATUS_MADE_MOPOX, 2;
+    set @Q_STATUS_DIDNT_DRINK, 3;
+    set @Q_STATUS_WANTS_CHOCOCAKE, 4;
+    set @Q_STATUS_WANTS_ORANGECUPCAKE, 5;
+    set @Q_STATUS_COMPLETED, 6;
+    set @Q_STATUS_COMPLETED_ELANORE, 7;
+    set @Q_STATUS_COMPLETED_NOELANORE, 8;
+    set @Q_STATUS_COMPLETED_POST_ELANORE, 9;
+    set @Q_kadiya_status, 0;
+    set @Q_status, 0;
+    set @Q_MASK, 0;
+    set @Q_SHIFT, 0;
+    set @M_NAME, 1;
+    set @M_CANDY, 2;
+    set @M_POTION, 3;
+    set @M_CHOCOCAKE, 4;
+    set @M_CUPCAKE, 5;
+    set @choice, 0;
+    set @choices_nr, 0;
+    cleararray @choice_idx[0], 0, 7;
+    cleararray @choice$[0], "", 7;
     close;
 
 S_update_var:
diff --git a/world/map/npc/001-2/shops.txt b/world/map/npc/001-2/shops.txt
index d4cf178b..75753a4f 100644
--- a/world/map/npc/001-2/shops.txt
+++ b/world/map/npc/001-2/shops.txt
@@ -6,5 +6,7 @@
     set @npcname$, "Rebecca the Inn Keeper";
     set @cost, 100;
     callfunc "Inn";
+    set @npcname$, "";
+    set @cost, 0;
     close;
 }