Correct close behaviour in many dialogues. Democratize l_Quit function.

1 files changed, 17 insertions, 17 deletions

diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index 1ba7c98e..9cd2a384 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -12,9 +12,9 @@
 //    3   Get back to Darlin.

 

 000-1.gat,89,95,0,1	script	Darlin	103;14,{

-
+

     mesn;

-    set @q, getq(ShipQuests_Darlin);
+    set @q, getq(ShipQuests_Darlin);

     if (@q == 1 || @q == 2) goto OnQuestGiven;

     if (@q > 2) goto l_QuestDone;

 OnStart:

@@ -76,8 +76,8 @@ OnStart:
     next;

 

 l_Menu:

-    set @q, getq(ShipQuests_Darlin);
-
+    set @q, getq(ShipQuests_Darlin);

+

     menu

         l("Maybe you can come down to talk?"), l_GoDown,

         l("I'm looking for Gugli, where is he?"), -,

@@ -90,7 +90,7 @@ l_Menu:
     next;

     mesq l("HE IS AT THE BOTTOM OF THE SHIP, DOWN THE STAIRS. YOU CAN'T MISS HIM!");

     restorecam;

-
+

     close;

 

 l_GoDown:

@@ -134,10 +134,7 @@ l_Bye:
     mesn;

     mesq l("FINE, BYE!");

 

-l_Quit:

-    close;

-

-OnQuestGiven:
+OnQuestGiven:

     mesq l("HEY @@!", strcharinfo(0));

     next;

     mesq l("DID YOU FIND OUT WHAT THE LIGHT WAS?!");

@@ -157,7 +154,7 @@ OnQuestGiven:
     goto l_Menu;

 

 l_Nothing:

-    if (@q == 2) setq ShipQuests_Darlin, 3;
+    if (@q == 2) setq ShipQuests_Darlin, 3;

     mes "";

     mesn;

     mesq l("OH, OK!");

@@ -170,19 +167,22 @@ l_Chest:
     mesq l("SORRY, BUT WHAT DID YOU SAY? SPEAK LOUDER!");

     next;

     mesq l("IF YOU FIND SOMETHING, THEN IT'S GREAT!");

-
-    setq ShipQuests_Darlin, 3;
+

+    setq ShipQuests_Darlin, 3;

     goto l_Menu;

 

 l_DangerAround:

     mesq l("NOTHING ELSE OTHER THAN SHARKS AND AN ODD LIGHT!");

  

     close;

-
+

 l_QuestDone:

     mesq l("HEY") + " " + strcharinfo(0) + "!"; 

-    next;
-
-    goto l_Menu;
+    next;

+

+    goto l_Menu;

+

+l_Quit:

+    close;

 

-}
+}