Merge branch 'master' into jesusalva/fishingjesusalva/fishing

3 files changed, 13 insertions, 33 deletions

diff --git a/npc/001-1/manhole.txt b/npc/001-1/manhole.txt
index f2bae5f0..77616cf1 100644
--- a/npc/001-1/manhole.txt
+++ b/npc/001-1/manhole.txt
@@ -20,11 +20,9 @@
         l("..."),
         l("Do you want to enter in sewer?"));
 
-    if (askyesno() == 1) {
-        cwarp("001-3-0", 152, 56);
-    }
-
-    bye;
+    closeclientdialog();
+    if (askyesno() == 1) slide_or_warp("001-3-0", 152, 56);
+    close;
 
 OnInit:
     .sex = G_OTHER;
@@ -43,11 +41,9 @@ OnInit:
         l("..."),
         l("Do you want to enter in sewer?"));
 
-    if (askyesno() == 1) {
-        cwarp("001-3-0", 196, 36);
-    }
-
-    bye;
+    closeclientdialog();
+    if (askyesno() == 1) slide_or_warp("001-3-0", 196, 36);
+    close;
 
 OnInit:
     .sex = G_OTHER;
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index cb6dfb69..c8ea3ab8 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -146,7 +146,7 @@ L_SalemMenuShop:
 
 L_AboutPious:
     speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
-        l("Ah, the locals like keeping them as pets.");
+        l("Ah, the locals like keeping them as pets."),
         l("With proper training, a piou can become a good friend and faithful companion in your adventures.");
 
     if (getq(ArtisQuests_CatchPiou) >= 2)
diff --git a/npc/001-1/xilaxa.txt b/npc/001-1/xilaxa.txt
index 5b7ec398..f6f1189c 100644
--- a/npc/001-1/xilaxa.txt
+++ b/npc/001-1/xilaxa.txt
@@ -6,28 +6,12 @@
 
 001-1,52,44,0	script	Xilaxa#001-1	NPC_UKAR_MALE_LEGION_ARTIS,{
 
-    function face_to_PC {
-        getmapxy(.@map$, .@cx, .@cy, 0);
-        @Devis_old_dir = .dir;
-        npc_turntoxy(.@cx, .@cy);
-
-        return;
-    }
-
-    function local_close {
-        if (@Devis_old_dir != .dir)
-        {
-            .dir = @Devis_old_dir;
-        }
-        npc_resumemove;
-
-        close;
-    }
-
-    npc_pausemove;
-    face_to_PC;
-    npctalkonce goodbye_msg();
-    local_close;
+    npc_pausemove();
+    getmapxy(.@map$, .@cx, .@cy, 0);
+    npc_turntoxy(.@cx, .@cy);
+    npctalkonce("Hello.");
+    npc_resumemove();
+    close;
 
 OnTimer1000:
     dographmovestep;