diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-03-19 21:09:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-03-19 21:09:38 +0300 |
| commit | e1ca11a950b7553cbafff6902a26c6a4023f9df9 (patch) | |
| tree | 1c78eeb01157f7df66b42130716b1a1928f93911 /npc/functions | |
| parent | 1c644eea65083558fc029345a8b4d2b81d0625e1 (diff) | |
| download | serverdata-e1ca11a950b7553cbafff6902a26c6a4023f9df9.tar.gz serverdata-e1ca11a950b7553cbafff6902a26c6a4023f9df9.tar.bz2 serverdata-e1ca11a950b7553cbafff6902a26c6a4023f9df9.tar.xz serverdata-e1ca11a950b7553cbafff6902a26c6a4023f9df9.zip | |
Replace select with yes/no to askyesno function.
Diffstat (limited to 'npc/functions')
| -rw-r--r-- | npc/functions/beds.txt | 2 | ||||
| -rw-r--r-- | npc/functions/main.txt | 5 | ||||
| -rw-r--r-- | npc/functions/marriage.txt | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/npc/functions/beds.txt b/npc/functions/beds.txt index 299ceda8..8fa1e4b1 100644 --- a/npc/functions/beds.txt +++ b/npc/functions/beds.txt @@ -21,7 +21,7 @@ function script bedTouch { function script bedClic { narrator 4, l("Do you want to use this place as save point?"); - if (select (menuaction(l("Yes")), menuaction(l("No"))) == 1) + if (askyesno() == ASK_YES) { savepointparticle (getarg (0), getarg (1), getarg (2), getarg (3)); } diff --git a/npc/functions/main.txt b/npc/functions/main.txt index 0632bcec..f2dad770 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -167,3 +167,8 @@ function script abs { .@n = getarg(0); return .@n >= 0 ? .@n : -.@n; } + +function script askyesno { + return select (menuaction(l("Yes")), + menuaction(l("No"))); +} diff --git a/npc/functions/marriage.txt b/npc/functions/marriage.txt index 222d4934..bb24f439 100644 --- a/npc/functions/marriage.txt +++ b/npc/functions/marriage.txt @@ -122,7 +122,7 @@ function script marriageacceptpartner { function script askmarry { speech l("Do you want to marry @@?", getarg(0)); - if (select(menuaction(l("Yes")), menuaction(l("No"))) == 1) + if (askyesno() == ASK_YES) return true; return false; } @@ -236,7 +236,7 @@ function script marriagedivorce { { case 1: speech l("Are you sure?"); - if (select(menuaction(l("Yes")), menuaction(l("No"))) == 1) + if (askyesno() == ASK_YES) { if (divorce()) { |