Fixes a bug in npc omar (goto non existent label) and set the values to zero.

1 files changed, 19 insertions, 15 deletions

diff --git a/world/map/npc/001-2/omar.txt b/world/map/npc/001-2/omar.txt
index 5e786d83..c541fce6 100644
--- a/world/map/npc/001-2/omar.txt
+++ b/world/map/npc/001-2/omar.txt
@@ -155,6 +155,20 @@ L_cured_elanore:
     callsub S_update_var;
     goto L_Close;
 
+L_Close:
+    set @Q_STATUS_KNOWS_MOPOX, 0;
+    set @Q_STATUS_MADE_MOPOX, 0;
+    set @Q_STATUS_DIDNT_DRINK, 0;
+    set @Q_STATUS_WANTS_CHOCOCAKE, 0;
+    set @Q_STATUS_WANTS_ORANGECUPCAKE, 0;
+    set @Q_STATUS_COMPLETED, 0;
+    set @Q_STATUS_COMPLETED_ELANORE, 0;
+    set @Q_STATUS_COMPLETED_NOELANORE, 0;
+    set @Q_STATUS_COMPLETED_POST_ELANORE, 0;
+    set @Q_status, 0;
+    close;
+
+
 S_update_var:
     set QUEST_MAGIC2, (QUEST_MAGIC2 & ~(NIBBLE_3_MASK) | (@Q_status << NIBBLE_3_SHIFT));
     return;
@@ -294,24 +308,14 @@ L_cured:
     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 @M_NAME, 0;
+    set @M_CANDY, 0;
+    set @M_POTION, 0;
+    set @M_CHOCOCAKE, 0;
+    set @M_CUPCAKE, 0;
     set @choice, 0;
     set @choices_nr, 0;
     cleararray @choice_idx[0], 0, 7;