Fix an equivocation

1 files changed, 21 insertions, 15 deletions

diff --git a/npc/015-8/sealedshrine.txt b/npc/015-8/sealedshrine.txt
index 571030dd1..97a494f15 100644
--- a/npc/015-8/sealedshrine.txt
+++ b/npc/015-8/sealedshrine.txt
@@ -25,18 +25,6 @@ function	script	SaggySealCheck	{
     return true;
 }
 
-// Main menu
-// ( .name$ )
-function	script	SaggySealInit	{
-    mesc l("Attempt to break the seal?");
-    mesc l("Warning: This will drain mana and spawn monsters. You shall not leave this cave section!");
-    if (askyesno() == ASK_YES) {
-        npctalk3 l("You started the seal break sequence. Please stand by.");
-        addtimer(1000, getarg(0)+"::OnBreakSeal01");
-    }
-    return;
-}
-
 // Seal Spawn
 // (name, seal x, seal y, stageId, {seal map})
 function	script	SaggySealInit	{
@@ -106,6 +94,24 @@ function	script	SaggySealInit	{
     return;
 }
 
+// Main menu - SaggySealTrueInit
+// ( .name$, x, y )
+function	script	SaggySealTrueInit	{
+    // Do nothing if @SaggySeal$ is busy - we will NOT begin another unsealing.
+    if (@SaggySeal$ != "")
+        end;
+
+    // Okay, we can begin! (variable will be filled on SaggySealInit)
+    mesc l("Attempt to break the seal?");
+    mesc l("Warning: This will drain mana and spawn monsters. You shall not leave this cave section!");
+    if (askyesno() == ASK_YES) {
+        npctalk3 l("You started the seal break sequence. Please stand by.");
+        SaggySealInit(getarg(0), getarg(1), getarg(2), 0);
+    }
+    closeclientdialog;
+    return;
+}
+
 
 
 
@@ -168,7 +174,7 @@ OnTouch:
     }
 
     // It is stage 3, so we will write to setq3 that the seal is open... Soon.
-    SaggySealInit(.name$, .x, .y, 0);
+    SaggySealTrueInit(.name$, .x, .y);
     end;
 
 OnBreakSeal01:
@@ -254,7 +260,7 @@ OnTouch:
     }
 
     // It is stage 3, so we will write to setq3 that the seal is open... Soon.
-    SaggySealInit(.name$, .x, .y, 0);
+    SaggySealTrueInit(.name$, .x, .y);
     end;
 
 OnBreakSeal01:
@@ -340,7 +346,7 @@ OnTouch:
     }
 
     // It is stage 3, so we will write to setq3 that the seal is open... Soon.
-    SaggySealInit(.name$, .x, .y, 0);
+    SaggySealTrueInit(.name$, .x, .y);
     end;
 
 OnBreakSeal01: