Add menuaction script function. Replace all action string to this function.

Also fix other usage of chars "[]".

5 files changed, 9 insertions, 9 deletions

diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index f74db3df..dc48a46b 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -44,10 +44,10 @@
     {
         menuint
             rif(.@fexil == 1, l("Have you seen Fexil?")), 0,
-            l("[Trade]"), 1,
+            menuaction(l("Trade")), 1,
             l("How do these dyes work?"), 2,
             l("I want to make my own dyes."), 3,
-            l("[Quit]"), 4;
+            menuaction(l("Quit")), 4;
 
         switch (@menuret)
         {
diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt
index a9429ec9..a6ccb39a 100644
--- a/npc/001-1/chelios.txt
+++ b/npc/001-1/chelios.txt
@@ -83,7 +83,7 @@
                 rif (.@enora == 3, l("I have your black iron.")), 2,
                 rif (.@enora >= 2, l("Where is the Merchant Guild?")), 3,
                 l("What is this building?"), 4,
-                l("[Quit]"), 5;
+                menuaction(l("Quit")), 5;
 
         switch (@menuret)
         {
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index a6d05154..794a5a4f 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -342,7 +342,7 @@
         speech 5,
             l("Are you sure that they are my potions?");
 
-        switch (select (l("[Yes]"), l("[No]")))
+        switch (select (menuaction(l("Yes")), menuaction(l("No"))))
         {
             case 1:
                 delitem PibberiesInfusion, 5;
diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt
index 1a793a11..afa5967e 100644
--- a/npc/001-1/qpid.txt
+++ b/npc/001-1/qpid.txt
@@ -128,8 +128,8 @@
             l("But if you fail, you will have to get them from the alchemist."),
             l("Deal?");
 
-        switch (select (l("[Yes]"),
-                        l("[No]")))
+        switch (select (menuaction(l("Yes")),
+                        menuaction(l("No"))))
         {
             case 1:
                 riddle_enigma;
@@ -176,11 +176,11 @@
 
         menuint
             rif (.@enora == 7, l("Enora wants her potions.")), 0,
-            l("[Trade]"), 1,
+            menuaction(l("Trade")), 1,
             rif (.@enora > 7, l("What was your riddle?")), 2,
             l("How do you do your potions?"), 3,
             l("What are you reading?"), 4,
-            l("[Quit]"), 5;
+            menuaction(l("Quit")), 5;
 
         switch (@menuret)
         {
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index 40f30185..3fb6d4ee 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -112,7 +112,7 @@ L_SalemMenuShop:
         l("Let's trade."), 1,
         rif(.@q != 0, l("I'd like to buy a piou.")), 2,
         rif(.@fexil == 1, l("I'm looking for somebody named Fexil.")), 3,
-        l("[Quit]"), 4;
+        menuaction(l("Quit")), 4;
 
     switch (@menuret)
     {