- fixed deprecation warnings in core scripts

Actually no warnings here (drfrag)

# Conflicts:
#	wadsrc/static/zscript/ui/statscreen/statscreen.zs
This commit is contained in:
alexey.lysiuk 2019-04-28 11:26:01 +03:00 committed by drfrag
parent 6da5f579e0
commit 1577da4186
2 changed files with 5 additions and 5 deletions

View file

@ -170,7 +170,7 @@ class ConversationMenu : Menu
goodbyestr = String.Format("$TXT_%s_%02d", goodbyestr, Random[RandomSpeech](1, NUM_RANDOM_LINES));
}
goodbyestr = Stringtable.Localize(goodbyestr);
if (goodbyestr.Length() == 0 || goodbyestr.CharAt(0) == "$") goodbyestr = "Bye.";
if (goodbyestr.Length() == 0 || goodbyestr.Left(1) == "$") goodbyestr = "Bye.";
mResponses.Push(mResponseLines.Size());
mResponseLines.Push(goodbyestr);
@ -203,7 +203,7 @@ class ConversationMenu : Menu
{
let dlgtext = String.Format("$TXT_%s_%02d", toSay, random[RandomSpeech](1, NUM_RANDOM_LINES));
toSay = Stringtable.Localize(dlgtext);
if (toSay.CharAt(0) == "$") toSay = Stringtable.Localize("$TXT_GOAWAY");
if (toSay.Left(1) == "$") toSay = Stringtable.Localize("$TXT_GOAWAY");
}
else
{

View file

@ -61,10 +61,10 @@ class os_Query
private static bool contains(string str, string substr)
{
str .toLower();
substr.toLower();
let lowerstr = str.MakeLower();
let lowersubstr = substr.MakeLower();
bool contains = (str.IndexOf(substr) != -1);
bool contains = (lowerstr.IndexOf(lowersubstr) != -1);
return contains;
}