From 02f9f13bda976e9afd38436ef56c2a81d09ef9fe Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Thu, 31 May 2018 16:54:24 -0300 Subject: Remove selectd (unused function) --- npc/002-3/juliet.txt | 2 +- npc/002-3/note.txt | 2 +- npc/003-3/malindou.txt | 8 ++++---- npc/005-5/cynric.txt | 10 ++++++---- npc/009-1/barzil.txt | 8 ++++---- npc/functions/quest-debug/functions.txt | 35 +-------------------------------- 6 files changed, 17 insertions(+), 48 deletions(-) (limited to 'npc') diff --git a/npc/002-3/juliet.txt b/npc/002-3/juliet.txt index 2a9888b73..877c48acc 100644 --- a/npc/002-3/juliet.txt +++ b/npc/002-3/juliet.txt @@ -144,7 +144,7 @@ .@q3 = getq(ShipQuests_Nard); .@q4 = getq(General_Narrator); - selectd + select l("I am hungry. Can I buy some food here?"), rif(getskilllv(NV_BASIC) < 6, l("Something is wrong with me, I can't smile nor sit.")), lg("I made a mistake, I would like to change my language."), diff --git a/npc/002-3/note.txt b/npc/002-3/note.txt index 5306381c6..2b7cde99c 100644 --- a/npc/002-3/note.txt +++ b/npc/002-3/note.txt @@ -14,7 +14,7 @@ l("The La Johanne always have interesting notes."); do { - selectd + select l("Read the Rules."), l("Read the News."), l("Leave."); diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt index 5a90619c8..06090a7e7 100644 --- a/npc/003-3/malindou.txt +++ b/npc/003-3/malindou.txt @@ -32,7 +32,7 @@ l("Welcome!"), l("My name is Malindou, I am a representative of the Merchant Guild on Tulimshar."); - selectd(l("My name is @@...", strcharinfo(0))); + select(l("My name is @@...", strcharinfo(0))); speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("\"@@\", I like this name!", strcharinfo(0)), @@ -43,7 +43,7 @@ l("I see."), lg("You are new around here, right?"); - if (selectd(l("How do you know?"), l("Yes I am.")) == 1) + if (select(l("How do you know?"), l("Yes I am.")) == 1) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Oh, it is simple. I have on this book the names of every citizen of Tulimshar and its surroundings."), @@ -65,7 +65,7 @@ speech S_LAST_NEXT, l("The fee is of @@ GP. So, do you want to register?", .@price); - switch (selectd(l("Yes."), + switch (select(l("Yes."), l("I don't have the time now."))) { case 1: @@ -107,7 +107,7 @@ do { - selectd + select l("I would like to store some items."), l("I would like to perform money transactions."), l("What is this guild for?"), diff --git a/npc/005-5/cynric.txt b/npc/005-5/cynric.txt index 72b03e6ce..4e0608baa 100644 --- a/npc/005-5/cynric.txt +++ b/npc/005-5/cynric.txt @@ -32,7 +32,9 @@ l("Welcome!"), l("My name is Cynric, I am a representative of the Merchant Guild on Candor."); - selectd(l("My name is @@...", strcharinfo(0))); + select( + l("My name is @@...", strcharinfo(0)) + ); speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("\"@@\", I like this name!", strcharinfo(0)), @@ -43,7 +45,7 @@ l("I see."), lg("You are new around here, right?"); - if (selectd(l("How do you know?"), l("Yes I am.")) == 1) + if (select(l("How do you know?"), l("Yes I am.")) == 1) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Oh, it is simple. I have on this book the names of every citizen of Candor and its surroundings."), @@ -65,7 +67,7 @@ speech S_LAST_NEXT, l("The fee is of @@ GP. So, do you want to register?", .@price); - switch (selectd(l("Yes."), + switch (select(l("Yes."), l("I don't have the time now."))) { case 1: @@ -106,7 +108,7 @@ do { - selectd + select l("I would like to store some items."), l("I would like to perform money transactions."), l("What is this guild for?"), diff --git a/npc/009-1/barzil.txt b/npc/009-1/barzil.txt index 55f284765..609d10037 100644 --- a/npc/009-1/barzil.txt +++ b/npc/009-1/barzil.txt @@ -33,7 +33,7 @@ l("Welcome!"), l("My name is Barzil, I am a representative of the Merchant Guild on Halinarzo."); - selectd(l("My name is @@...", strcharinfo(0))); + select(l("My name is @@...", strcharinfo(0))); speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("\"@@\", I like this name!", strcharinfo(0)), @@ -44,7 +44,7 @@ l("I see."), lg("You are new around here, right?"); - if (selectd(l("How do you know?"), l("Yes I am.")) == 1) + if (select(l("How do you know?"), l("Yes I am.")) == 1) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Oh, it is simple. I have on this book the names of every citizen of Halinarzo and its surroundings."), @@ -66,7 +66,7 @@ speech S_LAST_NEXT, l("The fee is of @@ GP. So, do you want to register?", .@price); - switch (selectd(l("Yes."), + switch (select(l("Yes."), l("I don't have the time now."))) { case 1: @@ -108,7 +108,7 @@ do { - selectd + select l("I would like to store some items."), l("I would like to perform money transactions."), l("What is this guild for?"), diff --git a/npc/functions/quest-debug/functions.txt b/npc/functions/quest-debug/functions.txt index f89adfab7..9dd057ad6 100644 --- a/npc/functions/quest-debug/functions.txt +++ b/npc/functions/quest-debug/functions.txt @@ -14,7 +14,7 @@ function script GenericQuestDebug { if (!debug && !is_admin()) { select - menuimage("actions/back", l("Go back")); + l("Go back"); @menuret = -0x7FFFFFFF; return 1; @@ -73,37 +73,4 @@ function script GenericQuestDebug { -// selectd -// like a normal select() but gives access to quest debug -// -// quest id can either be passed as first argument -// or as the .quest_debug npc variable -function script selectd { - .@menustr$ = rif(debug, menuaction(l("debug"))); - .@count = getargcount(); - .@f = 0; - .@questID = getvariableofnpc(.quest_debug, strnpcinfo(0)); - - if (.@count > 1 && !isstr(getarg(0))) - { - ++.@f; - .@questID = getarg(0); - } - - for (; .@f < .@count; ++.@f) - { - .@menustr$ += ":" + getarg(.@f); - } - - @menu = 255; - select .@menustr$; - - switch (@menu) - { - 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; - } -} -- cgit v1.2.3-70-g09d2