From 636e614ba484a31e7f333e732d4292308e9beb89 Mon Sep 17 00:00:00 2001 From: Anton Tarasenko Date: Sat, 6 Nov 2021 02:34:35 +0700 Subject: [PATCH] Fix using old method name `ToPlainString()` --- sources/GameModes/BaseGameMode.uc | 8 ++++---- sources/GameModes/GameMode.uc | 10 +++++----- sources/VotingHandlerAdapter.uc | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sources/GameModes/BaseGameMode.uc b/sources/GameModes/BaseGameMode.uc index b7141c0..266958d 100644 --- a/sources/GameModes/BaseGameMode.uc +++ b/sources/GameModes/BaseGameMode.uc @@ -106,7 +106,7 @@ protected function FromData(AssociativeArray source) } nextText = source.GetText(P("difficulty")); if (nextText != none) { - difficulty = nextText.ToPlainString(); + difficulty = nextText.ToString(); } includeFeature = DynamicIntoStringArray(source.GetDynamicArray(P("includeFeature"))); @@ -136,11 +136,11 @@ private final function FeatureConfigPair AssociativeArrayIntoPair( } nextText = source.GetText(P("feature")); if (nextText != none) { - result.feature = nextText.ToPlainString(); + result.feature = nextText.ToString(); } nextText = source.GetText(P("config")); if (nextText != none) { - result.config = nextText.ToPlainString(); + result.config = nextText.ToString(); } return result; } @@ -157,7 +157,7 @@ private final function array DynamicIntoStringArray(DynamicArray source) { nextText = source.GetText(i); if (nextText != none) { - includeFeature[i] = nextText.ToPlainString(); + includeFeature[i] = nextText.ToString(); } } } diff --git a/sources/GameModes/GameMode.uc b/sources/GameModes/GameMode.uc index 4c1960f..bafe5bc 100644 --- a/sources/GameModes/GameMode.uc +++ b/sources/GameModes/GameMode.uc @@ -91,15 +91,15 @@ protected function FromData(AssociativeArray source) } nextText = source.GetText(P("gameTypeClass")); if (nextText != none) { - gameTypeClass = nextText.ToPlainString(); + gameTypeClass = nextText.ToString(); } nextText = source.GetText(P("acronym")); if (nextText != none) { - acronym = nextText.ToPlainString(); + acronym = nextText.ToString(); } nextText = source.GetText(P("mapPrefix")); if (nextText != none) { - mapPrefix = nextText.ToPlainString(); + mapPrefix = nextText.ToString(); } nextArray = source.GetDynamicArray(P("option")); if (nextArray == none) { @@ -112,11 +112,11 @@ protected function FromData(AssociativeArray source) nextPair.value = ""; nextText = source.GetText(P("key")); if (nextText != none) { - nextPair.key = nextText.ToPlainString(); + nextPair.key = nextText.ToString(); } nextText = source.GetText(P("value")); if (nextText != none) { - nextPair.value = nextText.ToPlainString(); + nextPair.value = nextText.ToString(); } option[option.length] = nextPair; } diff --git a/sources/VotingHandlerAdapter.uc b/sources/VotingHandlerAdapter.uc index 18d76ba..5b921aa 100644 --- a/sources/VotingHandlerAdapter.uc +++ b/sources/VotingHandlerAdapter.uc @@ -174,8 +174,8 @@ private function string BuildOptionsString(GameMode gameMode) options = gameMode.GetOptions(); for (iter = options.Iterate(); !iter.HasFinished(); iter.Next()) { - nextKey = Text(iter.GetKey()).ToPlainString(); - nextValue = Text(iter.Get()).ToPlainString(); + nextKey = Text(iter.GetKey()).ToString(); + nextValue = Text(iter.Get()).ToString(); if (optionWasAdded) { result $= "?"; } @@ -227,7 +227,7 @@ public final function PrepareForServerTravel() nextGameClass = class(_.memory.LoadClassS(nextGameClassName)); } default.isServerTraveling = true; - default.targetGameMode = availableGameModes[pickedVHConfig].ToPlainString(); + default.targetGameMode = availableGameModes[pickedVHConfig].ToString(); nextGameMode = GetConfigFromString(default.targetGameMode); default.storedGameDifficulty = nextGameClass.default.gameDifficulty; nextGameClass.default.gameDifficulty = GetNumericDifficulty(nextGameMode);