diff options
| author | Thibault Payet <monwarez@gmail.com> | 2017-10-21 18:38:09 +0200 |
|---|---|---|
| committer | Thibault Payet <monwarez@gmail.com> | 2017-12-29 10:04:04 +0100 |
| commit | 150d19a64aa2071172d530ffc50f694afb9108a5 (patch) | |
| tree | 61cc156327ede3fc393c67d1b37a383578895a97 /npc/functions | |
| parent | 5972a4d968a0ae67d66cb07a3d7c8db93488d4c5 (diff) | |
| download | serverdata-150d19a64aa2071172d530ffc50f694afb9108a5.tar.gz serverdata-150d19a64aa2071172d530ffc50f694afb9108a5.tar.bz2 serverdata-150d19a64aa2071172d530ffc50f694afb9108a5.tar.xz serverdata-150d19a64aa2071172d530ffc50f694afb9108a5.zip | |
rename closedialog to closeclientdialog
Diffstat (limited to 'npc/functions')
| -rw-r--r-- | npc/functions/beds.txt | 2 | ||||
| -rw-r--r-- | npc/functions/fishing.txt | 2 | ||||
| -rw-r--r-- | npc/functions/goodbye.txt | 8 | ||||
| -rw-r--r-- | npc/functions/quest-debug/functions.txt | 2 |
4 files changed, 7 insertions, 7 deletions
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; } } |