rename closedialog to closeclientdialog

63 files changed, 103 insertions, 103 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 5805994c..28f5431d 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -67,7 +67,7 @@ OnTalk:
     setq General_Narrator, 0;
     warp "000-2-1", 50, 38;
     savepoint "000-2-1", 50, 38;
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-0-1/narrator.txt b/npc/000-0-1/narrator.txt
index 5c7e4788..5f2bb81c 100644
--- a/npc/000-0-1/narrator.txt
+++ b/npc/000-0-1/narrator.txt
@@ -28,7 +28,7 @@
     setq ShipQuests_Nard, 6;
     savepoint "001-2-22", 50, 38;
     warp "001-2-22", 50, 38;
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index d31c8439..160b4327 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -71,7 +71,7 @@ OnTouch:
 
     warp "000-0-0", 26, 28;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-1/ale.txt b/npc/000-1/ale.txt
index 0a37eb02..82aa4739 100644
--- a/npc/000-1/ale.txt
+++ b/npc/000-1/ale.txt
@@ -100,7 +100,7 @@ L_TaskDone:
     close;
 
 L_Quit:
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-1/astapolos.txt b/npc/000-1/astapolos.txt
index df64b36b..fd90a83f 100644
--- a/npc/000-1/astapolos.txt
+++ b/npc/000-1/astapolos.txt
@@ -96,7 +96,7 @@ L_CallFunc:
         rif(getq(ShipQuests_Tibbo) == 0, l("Tibbo.")), L_Bottom,
         l("Nobody."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_HowAreYou:
@@ -143,7 +143,7 @@ L_Top:
 L_NoTask:
     npctalk3 l("Just leave me alone.");
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_TaskDone:
@@ -156,7 +156,7 @@ L_TaskDone:
 L_Whyning:
     npctalk3 l("Then leave me alone.");
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-1/darlin.txt b/npc/000-1/darlin.txt
index 1288ad83..e2a86d8a 100644
--- a/npc/000-1/darlin.txt
+++ b/npc/000-1/darlin.txt
@@ -139,7 +139,7 @@ L_DangerAround:
     goto L_Quit;
 
 L_Quit:
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-1/fexil.txt b/npc/000-1/fexil.txt
index de72aec2..fba4d817 100644
--- a/npc/000-1/fexil.txt
+++ b/npc/000-1/fexil.txt
@@ -24,7 +24,7 @@
             close;
 
         case 2:
-            closedialog;
+            closeclientdialog;
             shop "Bag#000-1";
             close;
 
diff --git a/npc/000-1/gugli.txt b/npc/000-1/gugli.txt
index e9e0e0b0..dd2e6739 100644
--- a/npc/000-1/gugli.txt
+++ b/npc/000-1/gugli.txt
@@ -232,7 +232,7 @@ L_AllComplete:
     goto L_Menu;
 
 L_Quit:
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-1/gulukan.txt b/npc/000-1/gulukan.txt
index 7b277fdf..d6bac175 100644
--- a/npc/000-1/gulukan.txt
+++ b/npc/000-1/gulukan.txt
@@ -160,7 +160,7 @@ L_TaskDone:
     close;
 
 L_Quit:
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-1/jalad.txt b/npc/000-1/jalad.txt
index 74de7f8f..b50db974 100644
--- a/npc/000-1/jalad.txt
+++ b/npc/000-1/jalad.txt
@@ -77,7 +77,7 @@ L_CallFunc:
         rif(getq(ShipQuests_Tibbo) == 0, l("Tibbo.")), L_Bottom,
         l("Nobody."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_Bottom:
diff --git a/npc/000-1/muller.txt b/npc/000-1/muller.txt
index 276557cb..8420341b 100644
--- a/npc/000-1/muller.txt
+++ b/npc/000-1/muller.txt
@@ -122,7 +122,7 @@ L_TaskDone:
     goodbye;
 
 L_Quit:
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-1/silvio.txt b/npc/000-1/silvio.txt
index 7cc3c32b..fd3c8c8b 100644
--- a/npc/000-1/silvio.txt
+++ b/npc/000-1/silvio.txt
@@ -166,14 +166,14 @@ L_Sailors:
         l("See you."), L_Quit,
         l("*Imitate a thunder's sound.*"), -;
 
-    closedialog;
+    closeclientdialog;
 
     npctalk3 l("Aaaaaahhhhhh!");
 
     close;
 
 L_Quit:
-    closedialog;
+    closeclientdialog;
 
     npctalk3 l("Give me a kiss before you say goodbye!");
 
diff --git a/npc/000-1/tarlan.txt b/npc/000-1/tarlan.txt
index 57914478..f90883d6 100644
--- a/npc/000-1/tarlan.txt
+++ b/npc/000-1/tarlan.txt
@@ -22,7 +22,7 @@
         l("Some food."), L_Food,
         l("Nothing, just hanging around."), -;
 
-    closedialog;
+    closeclientdialog;
     npctalk3 l("Ok, see you then!");
     goto L_Quit;
 
diff --git a/npc/000-2-0/julia.txt b/npc/000-2-0/julia.txt
index 33916d85..1fde8713 100644
--- a/npc/000-2-0/julia.txt
+++ b/npc/000-2-0/julia.txt
@@ -38,7 +38,7 @@
         if (select(l("Yes, I do."), l("No, none.")) == 1) {
             return;
         }
-        closedialog;
+        closeclientdialog;
     }
 
     function poisonJulia {
@@ -85,7 +85,7 @@
 
         if (@menu == 1)
         {
-            closedialog;
+            closeclientdialog;
             end;
         }
 
@@ -263,7 +263,7 @@
                 case 7: whereAmI; break;
                 case 8: whatHappened; break;
                 case 9: readRules; break;
-                case 10: closedialog; end;
+                case 10: closeclientdialog; end;
             }
         } while (1);
     }
diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt
index cc57c0d7..48a05e76 100644
--- a/npc/000-2-1/alige.txt
+++ b/npc/000-2-1/alige.txt
@@ -87,7 +87,7 @@ L_NeedHelp:
         l("Why not, but who are you, and what kind of help do you need?"), L_CanHelp;
         l("Sorry but I have no time for this."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_CanHelp:
diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 9207e03d..35d1edfa 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -155,7 +155,7 @@ L_Menu:
         rif(!.@equipped, l("Thank you, I'll take them and put them on.")), -,
         l("Nothing, sorry."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_Where:
@@ -251,7 +251,7 @@ L_GotoSleep:
                 l("Fine."),
                 l("We are at half a day from our final destination, by the time that you wake up I'm sure that we will be there!");
 
-                closedialog;
+                closeclientdialog;
                 doevent "#name3::OnClick";
                 close;
 
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index ca069d8e..69570fcf 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -203,7 +203,7 @@ L_QuestAborted:
     close;
 
 L_Quit:
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index d8d1d54a..906476a3 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -22,7 +22,7 @@
         l("Yes."), L_Give,
         l("No."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_Give:
diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt
index 1dbef832..8492b010 100644
--- a/npc/000-2-2/doors.txt
+++ b/npc/000-2-2/doors.txt
@@ -26,12 +26,12 @@ L_Warn:
         l("No."), -;
 
     warp "000-2-2", 48, 28;
-    closedialog;
+    closeclientdialog;
     close;
 
 L_Warp:
     warp "000-2-1", 72, 36;
-    closedialog;
+    closeclientdialog;
     close;
 }
 
@@ -49,7 +49,7 @@ OnTouch:
         l("Break the door."), L_Break,
         l("Go away."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_Break:
diff --git a/npc/000-2-3/box.txt b/npc/000-2-3/box.txt
index cc280b74..15ac23ce 100644
--- a/npc/000-2-3/box.txt
+++ b/npc/000-2-3/box.txt
@@ -103,7 +103,7 @@ L_Already:
     close;
 
 L_Quit:
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/000-2-3/nard.txt b/npc/000-2-3/nard.txt
index 86dbe50a..807127af 100644
--- a/npc/000-2-3/nard.txt
+++ b/npc/000-2-3/nard.txt
@@ -248,11 +248,11 @@ L_GoBackArtis:
                 warp "001-2-24", 22, 27;
             }
 
-            closedialog;
+            closeclientdialog;
             close;
 
         case 2:
-            closedialog;
+            closeclientdialog;
             npctalk3 l("This is Drasil Island, I named it after an ancient mythical tree.");
             close;
 
@@ -260,7 +260,7 @@ L_GoBackArtis:
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Ok I stay here with my paperwork if you need my help.");
 
-            closedialog;
+            closeclientdialog;
             close;
     }
 
diff --git a/npc/001-1/artaxe.txt b/npc/001-1/artaxe.txt
index 9f8e02f2..79cac06a 100644
--- a/npc/001-1/artaxe.txt
+++ b/npc/001-1/artaxe.txt
@@ -9,7 +9,7 @@
         l("Sorry buddy, you can't pass by this way, we're moving some furniture."),
         l("Come back later!");
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt
index 7f3d6a0a..c8b5b8bb 100644
--- a/npc/001-1/calypsan.txt
+++ b/npc/001-1/calypsan.txt
@@ -36,7 +36,7 @@
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("For what kind of tissue?");
         .@tissue_type = select(l("Cotton"), l("Cashmere"));
 
-        closedialog;
+        closeclientdialog;
         switch (.@tissue_type)
         {
             case 1:
@@ -93,7 +93,7 @@
         }
     } while (@menu != 5);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-1/chelios.txt b/npc/001-1/chelios.txt
index 2846f864..b0151ea2 100644
--- a/npc/001-1/chelios.txt
+++ b/npc/001-1/chelios.txt
@@ -105,7 +105,7 @@
         }
     } while (@menu != 5);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-1/cookiemaster.txt b/npc/001-1/cookiemaster.txt
index 77f95baa..f04a4797 100644
--- a/npc/001-1/cookiemaster.txt
+++ b/npc/001-1/cookiemaster.txt
@@ -205,7 +205,7 @@ L_Control:
     next;
 
 L_Kick:
-    closedialog;
+    closeclientdialog;
 
     npctalk3 l("No cookie for you!");
     warp "001-1", 39, 41;
@@ -245,7 +245,7 @@ L_LostCookie:
     npctalk3 l("You receive a @@!", getitemlink(DeliciousCookie));
 
 L_Bye:
-    closedialog;
+    closeclientdialog;
 
     npctalk3 l("See you later!");
 
diff --git a/npc/001-1/doors.txt b/npc/001-1/doors.txt
index 31ca2b7d..67936b4b 100644
--- a/npc/001-1/doors.txt
+++ b/npc/001-1/doors.txt
@@ -20,7 +20,7 @@ OnTouch:
         warp "001-2-33", 34, 46;
     }
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnUnTouch:
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index fea6d6e7..45e6e551 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -157,7 +157,7 @@
 
         setq ArtisQuests_Enora, 1;
 
-        closedialog;
+        closeclientdialog;
         goodbye;
         close;
     }
@@ -201,7 +201,7 @@
         setq ArtisQuests_Enora, 5;
         enora_reward(60, 100);
 
-        closedialog;
+        closeclientdialog;
         npctalk3 l("Thank you very much!");
         close;
     }
@@ -238,7 +238,7 @@
         setq ArtisQuests_Enora, 7;
         enora_reward(40, 125);
 
-        closedialog;
+        closeclientdialog;
         npctalk3 l("Thank you very much!");
         close;
     }
@@ -281,7 +281,7 @@
                 break;
         }
 
-        closedialog;
+        closeclientdialog;
         npctalk3 l("Thank you very much!");
         close;
     }
@@ -430,7 +430,7 @@
         }
     } while (@menu != 12);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-1/fexil.txt b/npc/001-1/fexil.txt
index 55d87bc4..2ea78091 100644
--- a/npc/001-1/fexil.txt
+++ b/npc/001-1/fexil.txt
@@ -69,7 +69,7 @@
         setq ArtisQuests_Fexil, 2;
         fexil_quest;
 
-        closedialog;
+        closeclientdialog;
         goodbye;
         close;
     }
@@ -85,7 +85,7 @@
     switch (@menu)
     {
         case 1:
-            closedialog;
+            closeclientdialog;
             shop "Bag#001-1";
             close;
 
@@ -133,7 +133,7 @@
             break;
     }
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-1/lucas.txt b/npc/001-1/lucas.txt
index 4058d72e..beaba179 100644
--- a/npc/001-1/lucas.txt
+++ b/npc/001-1/lucas.txt
@@ -8,7 +8,7 @@
 
     villagertalk();
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/001-1/panels.txt b/npc/001-1/panels.txt
index a82fbabd..19d1fb11 100644
--- a/npc/001-1/panels.txt
+++ b/npc/001-1/panels.txt
@@ -13,7 +13,7 @@
     mesq l("You've reached the highest natural place of Artis, enjoy the view.");
     next;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
@@ -30,7 +30,7 @@ OnInit:
     mesq l("The other part of this sign has been crushed by a rock.");
     next;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
@@ -47,7 +47,7 @@ OnInit:
     narrator S_LAST_NEXT,
         l("Somebody tried to stroke the word \"fish\" and tried to replace it with \"sharkes\".");
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/001-1/qonan.txt b/npc/001-1/qonan.txt
index fe255799..48b0c3f8 100644
--- a/npc/001-1/qonan.txt
+++ b/npc/001-1/qonan.txt
@@ -28,7 +28,7 @@
         case 2:
         speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
             l("No problem, see you next time.");
-        closedialog;
+        closeclientdialog;
         close;
     }
 
diff --git a/npc/001-1/qpid.txt b/npc/001-1/qpid.txt
index d4194ddd..aab0ad84 100644
--- a/npc/001-1/qpid.txt
+++ b/npc/001-1/qpid.txt
@@ -141,7 +141,7 @@
                 enora_quest;
                 break;
             case 2:
-                closedialog;
+                closeclientdialog;
                 shop "Store#Potion001-1";
                 close;
             case 3:
@@ -159,7 +159,7 @@
         }
     } while (@menu != 6);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-1/salem.txt b/npc/001-1/salem.txt
index b80cb76e..cb6dfb69 100644
--- a/npc/001-1/salem.txt
+++ b/npc/001-1/salem.txt
@@ -121,7 +121,7 @@ L_SalemMenuShop:
             goto L_AboutPious;
             break;
         case 2:
-            closedialog;
+            closeclientdialog;
             shop "Store#General001-1";
             close;
         case 3:
@@ -140,7 +140,7 @@ L_SalemMenuShop:
             break;
     }
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
@@ -183,7 +183,7 @@ L_AboutPious:
         case 3:
             BuyPiou @ArtisQuests_PiouPrice;
     }
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-2-0/resa.txt b/npc/001-2-0/resa.txt
index 1530c861..951d7d6a 100644
--- a/npc/001-2-0/resa.txt
+++ b/npc/001-2-0/resa.txt
@@ -55,18 +55,18 @@
         {
             case 1:
                 enora_quest;
-                closedialog;
+                closeclientdialog;
                 goodbye;
                 close;
             case 2:
-                closedialog;
+                closeclientdialog;
                 shop "Store#001-2-0";
                 close;
             case 3:
                 explain_craft;
                 break;
             case 4:
-                closedialog;
+                closeclientdialog;
                 goodbye;
                 close;
         }
diff --git a/npc/001-2-12/oscar.txt b/npc/001-2-12/oscar.txt
index 3beecf36..5348af00 100644
--- a/npc/001-2-12/oscar.txt
+++ b/npc/001-2-12/oscar.txt
@@ -133,7 +133,7 @@
 
     } while (@menu != 3);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-2-19/lloyd.txt b/npc/001-2-19/lloyd.txt
index 9a0b2f37..20381d92 100644
--- a/npc/001-2-19/lloyd.txt
+++ b/npc/001-2-19/lloyd.txt
@@ -167,7 +167,7 @@
     {
         first_visit;
 
-        closedialog;
+        closeclientdialog;
         goodbye;
         close;
     }
@@ -195,7 +195,7 @@
                 break;
             case 2:
                 openstorage;
-                closedialog;
+                closeclientdialog;
                 close;
                 break;
             case 3:
@@ -224,7 +224,7 @@
         }
     } while (@menu != 6);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-2-22/alige.txt b/npc/001-2-22/alige.txt
index 70e6058e..b273fcdd 100644
--- a/npc/001-2-22/alige.txt
+++ b/npc/001-2-22/alige.txt
@@ -87,7 +87,7 @@ L_NeedHelp:
         l("Why not, but who are you, and what kind of help do you need?"), L_CanHelp;
         l("Sorry but I have no time for this."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_CanHelp:
diff --git a/npc/001-2-22/knife.txt b/npc/001-2-22/knife.txt
index 7502b163..be3bde60 100644
--- a/npc/001-2-22/knife.txt
+++ b/npc/001-2-22/knife.txt
@@ -22,7 +22,7 @@
         l("Yes."), L_Give,
         l("No."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_Give:
diff --git a/npc/001-2-23/doors.txt b/npc/001-2-23/doors.txt
index bb192082..f4495ef7 100644
--- a/npc/001-2-23/doors.txt
+++ b/npc/001-2-23/doors.txt
@@ -26,12 +26,12 @@ L_Warn:
         l("No."), -;
 
     warp "001-2-23", 48, 28;
-    closedialog;
+    closeclientdialog;
     close;
 
 L_Warp:
     warp "001-2-22", 72, 36;
-    closedialog;
+    closeclientdialog;
     close;
 }
 
@@ -49,7 +49,7 @@ OnTouch:
         l("Break the door."), L_Break,
         l("Go away."), -;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 L_Break:
diff --git a/npc/001-2-24/nard.txt b/npc/001-2-24/nard.txt
index 6c845838..4b76467a 100644
--- a/npc/001-2-24/nard.txt
+++ b/npc/001-2-24/nard.txt
@@ -64,17 +64,17 @@
                 warp "000-2-3", 22, 27;
             }
 
-            closedialog;
+            closeclientdialog;
             close;
         case 2:
             speech S_FIRST_BLANK_LINE | S_LAST_NEXT,
                 l("Ok we stay docked here if you need our help.");
 
-            closedialog;
+            closeclientdialog;
             close;
     }
 L_Info:
-    closedialog;
+    closeclientdialog;
     npctalk3 l("Don't you recognize the great city of Artis?");
     close;
 
@@ -84,7 +84,7 @@ L_Lost:
     mesq l("Julia made an appeal to the Legion of Aemil to get in touch with you, exit the ship and you should see your escort!");
     next;
 
-    closedialog;
+    closeclientdialog;
     close;
 
 OnInit:
diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt
index 251e1107..b0873bcc 100644
--- a/npc/001-2-26/ivan.txt
+++ b/npc/001-2-26/ivan.txt
@@ -75,7 +75,7 @@
             break;
     }
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-2-27/kaylo.txt b/npc/001-2-27/kaylo.txt
index 5134aa07..652eb3f6 100644
--- a/npc/001-2-27/kaylo.txt
+++ b/npc/001-2-27/kaylo.txt
@@ -15,7 +15,7 @@
         l("See you.")))
     {
         case 1:
-            closedialog;
+            closeclientdialog;
             shop "Store#Shield001-2-27";
             close;
         case 2:
diff --git a/npc/001-2-27/lydon.txt b/npc/001-2-27/lydon.txt
index 3dcd8005..ea497820 100644
--- a/npc/001-2-27/lydon.txt
+++ b/npc/001-2-27/lydon.txt
@@ -14,7 +14,7 @@
         l("Bye.")))
     {
         case 1:
-            closedialog;
+            closeclientdialog;
             shop "Store#Weapon001-2-27";
             close;
         case 2:
diff --git a/npc/001-2-28/jenna.txt b/npc/001-2-28/jenna.txt
index 4beb0604..439ab3b4 100644
--- a/npc/001-2-28/jenna.txt
+++ b/npc/001-2-28/jenna.txt
@@ -25,7 +25,7 @@
 
     speech S_LAST_NEXT, l("Do you want a drink?");
 
-    closedialog;
+    closeclientdialog;
     shop "#Invisible001-2-28";
     close;
 
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index 5600f2f2..330258b8 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -119,7 +119,7 @@
         }
     } while (.@q != 1 && .@q != 4);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-2-32/doors.txt b/npc/001-2-32/doors.txt
index 59ee35eb..ba33200f 100644
--- a/npc/001-2-32/doors.txt
+++ b/npc/001-2-32/doors.txt
@@ -18,6 +18,6 @@ OnTouch:
         warp "001-2-35", 24, 29;
     }
 
-    closedialog;
+    closeclientdialog;
     close;
 }
diff --git a/npc/001-2-33/lozerk.txt b/npc/001-2-33/lozerk.txt
index 6eb9cb37..05b40542 100644
--- a/npc/001-2-33/lozerk.txt
+++ b/npc/001-2-33/lozerk.txt
@@ -176,7 +176,7 @@
         }
     } while(@menu != 7);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/001-2-34/doors.txt b/npc/001-2-34/doors.txt
index 3e4fef7b..ca513945 100644
--- a/npc/001-2-34/doors.txt
+++ b/npc/001-2-34/doors.txt
@@ -24,6 +24,6 @@ OnTouch:
         warp "001-2-36", 36, 30;
     }
 
-    closedialog;
+    closeclientdialog;
     close;
 }
diff --git a/npc/001-2-4/robin.txt b/npc/001-2-4/robin.txt
index 320cf148..206dd993 100644
--- a/npc/001-2-4/robin.txt
+++ b/npc/001-2-4/robin.txt
@@ -15,11 +15,11 @@
                        l("Nothing.")))
         {
             case 1:
-                closedialog;
+                closeclientdialog;
                 npctalk3 l("Mostly manuals and tutorials but you won't find out until you open one!");
                 break;
             case 2:
-                closedialog;
+                closeclientdialog;
                 npctalk3 l("Good day to you!");
         }
         return;
diff --git a/npc/001-2-6/leonard.txt b/npc/001-2-6/leonard.txt
index 7b238c1a..259d4047 100644
--- a/npc/001-2-6/leonard.txt
+++ b/npc/001-2-6/leonard.txt
@@ -30,14 +30,14 @@
                        l("Nothing.")))
         {
             case 1:
-                closedialog;
+                closeclientdialog;
                 npctalk3 l("You can find novels and poems on this floor.");
                 break;
             case 2:
                 esperia_city();
                 break;
             case 3:
-                closedialog;
+                closeclientdialog;
                 npctalk3 l("Good day to you!");
         }
         return;
diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt
index a652a7c5..616991a6 100644
--- a/npc/001-2-9/janus.txt
+++ b/npc/001-2-9/janus.txt
@@ -159,7 +159,7 @@
         }
     } while (@menu != 5);
 
-    closedialog;
+    closeclientdialog;
     goodbye;
     close;
 
diff --git a/npc/commands/debug-look.txt b/npc/commands/debug-look.txt
index 4bdcf84f..79bf8699 100644
--- a/npc/commands/debug-look.txt
+++ b/npc/commands/debug-look.txt
@@ -15,7 +15,7 @@ function	script	BarberDebug	{
 
 
         // ^ Future code, Doesn't work yet
-        closedialog;
+        closeclientdialog;
         changecharsex;
     }
     function setStyle {
@@ -94,7 +94,7 @@ OnCall:
         end;
     }
     BarberDebug;
-    closedialog;
+    closeclientdialog;
     end;
 
 OnInit:
diff --git a/npc/commands/debug-quest.txt b/npc/commands/debug-quest.txt
index 889c988d..2c590a2d 100644
--- a/npc/commands/debug-quest.txt
+++ b/npc/commands/debug-quest.txt
@@ -149,7 +149,7 @@ OnCall:
         end;
     }
     GlobalQuestDebug;
-    closedialog;
+    closeclientdialog;
     end;
 
 OnInit:
diff --git a/npc/commands/debug-skill.txt b/npc/commands/debug-skill.txt
index 2e5393a4..1d1dfcd1 100644
--- a/npc/commands/debug-skill.txt
+++ b/npc/commands/debug-skill.txt
@@ -73,7 +73,7 @@ OnCall:
         end;
     }
     GlobalSkillDebug;
-    closedialog;
+    closeclientdialog;
     end;
 
 OnInit:
diff --git a/npc/commands/debug.txt b/npc/commands/debug.txt
index 193abb5b..50adf5e8 100644
--- a/npc/commands/debug.txt
+++ b/npc/commands/debug.txt
@@ -7,7 +7,7 @@ function	script	GlobalDebugMenu	{
             dispbottom l("Reset done!");
             if (getarg(0,0) == 3)
             {
-                closedialog;
+                closeclientdialog;
                 doevent "::OnGlobalQuestReset"; // executes in all quest npcs // FIXME: maybe have a `resetquest` buildin?
                 Zeny = 0;
                 BankVault = 0;
@@ -114,7 +114,7 @@ function	script	GlobalDebugMenu	{
             case 2: changeStats; break;
             case 3: GlobalSkillDebug .@c; break;
             case 4: BarberDebug .@c; break;
-            case 5: closedialog; clientcommand "createitems"; end;
+            case 5: closeclientdialog; clientcommand "createitems"; end;
             case 6: Zeny = 0x7FFFFFFE; break;
             case 7: GlobalQuestDebug .@c; break;
             case 8: resetAll; break;
@@ -134,7 +134,7 @@ OnCall:
         end;
     }
     GlobalDebugMenu;
-    closedialog;
+    closeclientdialog;
     end;
 
 OnInit:
diff --git a/npc/commands/event.txt b/npc/commands/event.txt
index db98bcf2..3f0d61de 100644
--- a/npc/commands/event.txt
+++ b/npc/commands/event.txt
@@ -49,7 +49,7 @@ OnCall:
     }
 
     GlobalEventMenu;
-    closedialog;
+    closeclientdialog;
     end;
 
 OnInit:
diff --git a/npc/commands/motd.txt b/npc/commands/motd.txt
index 9a9c702e..e21d7539 100644
--- a/npc/commands/motd.txt
+++ b/npc/commands/motd.txt
@@ -171,7 +171,7 @@ OnCall:
     }
 
     MOTDConfig;
-    closedialog;
+    closeclientdialog;
     end;
 
 OnPCLoginEvent:
diff --git a/npc/commands/scheduled-broadcasts.txt b/npc/commands/scheduled-broadcasts.txt
index 6bfbf293..972a0cf2 100644
--- a/npc/commands/scheduled-broadcasts.txt
+++ b/npc/commands/scheduled-broadcasts.txt
@@ -210,7 +210,7 @@ OnCall:
     }
 
     StoneBoard;
-    closedialog;
+    closeclientdialog;
     end;
 
 OnPCLoginEvent:
diff --git a/npc/commands/super-menu.txt b/npc/commands/super-menu.txt
index 5e5fb6f7..8102dd32 100644
--- a/npc/commands/super-menu.txt
+++ b/npc/commands/super-menu.txt
@@ -43,7 +43,7 @@ OnCall:
     }
 
     SuperMenu;
-    closedialog;
+    closeclientdialog;
     end;
 
 OnPCLoginEvent:
diff --git a/npc/functions/beds.txt b/npc/functions/beds.txt
index 4ab8b6a7..9c871a44 100644
--- a/npc/functions/beds.txt
+++ b/npc/functions/beds.txt
@@ -25,6 +25,6 @@ function	script	bedClic	{
     {
         savepointparticle getarg(0, ""), getarg(1, -1), getarg(2, -1), getarg(3, NO_INN);
     }
-    closedialog;
+    closeclientdialog;
     close;
 }
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 3d719ac7..9952fa17 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -277,7 +277,7 @@ function	script	fishing	{
     delitem .@bait, 1;
 
     // The player uses this spot, his bait is ready, he just has to wait for the signal.
-    closedialog;
+    closeclientdialog;
 
     specialeffect(.@initial_fx, SELF); // throw the bait
     sleep2 800;    // wait 0.8s for synchronize the sound of "plop" in water with the npc dir UP.
diff --git a/npc/functions/goodbye.txt b/npc/functions/goodbye.txt
index 620883b8..0e8dfc2e 100644
--- a/npc/functions/goodbye.txt
+++ b/npc/functions/goodbye.txt
@@ -56,7 +56,7 @@ function	script	cwarp	{
 
     getmapxy .@pc_map$, .@pc_x, .@pc_y, UNITTYPE_PC; // get char location
 
-    closedialog; // XXX: maybe send closeclientdialog in the future
+    closeclientdialog;
 
     if (getargcount() < 1)
     {
@@ -89,7 +89,7 @@ function	script	cwarp	{
 //     if no npc is given, calls "#<npc> $"
 
 function	script	cshop	{
-    closedialog; // XXX: maybe send closeclientdialog in the future
+    closeclientdialog;
     shop getarg(0, "#" + strnpcinfo(0) + " $");
     //close; => the shop buildin already sends close, and is a terminator itself
 }
@@ -100,7 +100,7 @@ function	script	cshop	{
 //     closes the dialog, then opens storage
 
 function	script	cstorage	{
-    closedialog; // XXX: maybe send closeclientdialog in the future
+    closeclientdialog;
     openstorage;
     close;
 }
@@ -113,7 +113,7 @@ function	script	cstorage	{
 
 function	script	bye	{
     .@emote = getarg(0, -1);
-    closedialog; // XXX: maybe send closeclientdialog in the future
+    closeclientdialog;
 
     if (.@emote >= 0)
         emotion .@emote;
diff --git a/npc/functions/quest-debug/functions.txt b/npc/functions/quest-debug/functions.txt
index f89adfab..e45cb427 100644
--- a/npc/functions/quest-debug/functions.txt
+++ b/npc/functions/quest-debug/functions.txt
@@ -104,6 +104,6 @@ function	script	selectd	{
         case -1:
         case 255: return -1;
         default: @menu -= 1; return @menu; // FIXME: here I would have done `return --@menu;` but hercules prevents this
-        case 1: callfunc "QuestDebug" + .@questID; closedialog; end;
+        case 1: callfunc "QuestDebug" + .@questID; closeclientdialog; end;
     }
 }