Gelid spaghetti untangling attempt 2king_gelid_sentences

1 files changed, 8 insertions, 7 deletions

diff --git a/npc/024-16/king.txt b/npc/024-16/king.txt
index 679ca003b..2211c5bc5 100644
--- a/npc/024-16/king.txt
+++ b/npc/024-16/king.txt
@@ -76,22 +76,23 @@
     setq General_Narrator, 13;
     REAL_ESTATE_CREDITS += 5000;
 
-L_MainQuest:
     mesn l("King Gelid Frozenheart");
+    mesq l("I gave you %s Real Estate Credits. Go book yourself a room in the Inn. And then come back to me so we may discuss details.",
+           fnum(5000));
     next;
+    // Fall-through
+L_MainQuest:
+    mesn l("King Gelid Frozenheart");
 
     mesc b(l(".:: Main Quest 6-1 ::.")), 3;
     msObjective(BaseLevel >= 40, l("* @@/@@ Base Level", BaseLevel, 40));
     msObjective(true, l("* Deliver Nikolai's Letter to Frostia Mayor"));
     msObjective(ESTATE_RENTTIME >= gettimetick(2), l("* Rent a room in Frostia's Inn"));
-    if (ESTATE_RENTTIME >= gettimetick(2))
-        goto L_Continue;
-    mesq l("I gave you %s Real Estate Credits. Go book yourself a room in the Inn. And then come back to me so we may discuss details.",
-           fnum(5000));
-    close;
 
-L_Continue:
+    if (ESTATE_RENTTIME < gettimetick(2))
+        close;
     next;
+
     mesn l("King Gelid Frozenheart");
     mesq l("Great, I see you've already made yourself comfortable!");
     next;