dkanus
/
Acedia
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Fix using old method name `ToPlainString()`

new
Anton Tarasenko 3 years ago
parent
3681fcabf7
commit
636e614ba4
3 changed files with 12 additions and 12 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      sources/GameModes/BaseGameMode.uc
  2. 10
      sources/GameModes/GameMode.uc
  3. 6
      sources/VotingHandlerAdapter.uc

8
sources/GameModes/BaseGameMode.uc
Unescape View File

@ -106,7 +106,7 @@ protected function FromData(AssociativeArray source)
} }
nextText = source.GetText(P("difficulty")); nextText = source.GetText(P("difficulty"));
if (nextText != none) { if (nextText != none) {
difficulty = nextText.ToPlainString(); difficulty = nextText.ToString();
} }
includeFeature = includeFeature =
DynamicIntoStringArray(source.GetDynamicArray(P("includeFeature"))); DynamicIntoStringArray(source.GetDynamicArray(P("includeFeature")));
@ -136,11 +136,11 @@ private final function FeatureConfigPair AssociativeArrayIntoPair(
} }
nextText = source.GetText(P("feature")); nextText = source.GetText(P("feature"));
if (nextText != none) { if (nextText != none) {
result.feature = nextText.ToPlainString(); result.feature = nextText.ToString();
} }
nextText = source.GetText(P("config")); nextText = source.GetText(P("config"));
if (nextText != none) { if (nextText != none) {
result.config = nextText.ToPlainString(); result.config = nextText.ToString();
} }
return result; return result;
} }
@ -157,7 +157,7 @@ private final function array<string> DynamicIntoStringArray(DynamicArray source)
{ {
nextText = source.GetText(i); nextText = source.GetText(i);
if (nextText != none) { if (nextText != none) {
includeFeature[i] = nextText.ToPlainString(); includeFeature[i] = nextText.ToString();
} }
} }
} }

10
sources/GameModes/GameMode.uc
Unescape View File

@ -91,15 +91,15 @@ protected function FromData(AssociativeArray source)
} }
nextText = source.GetText(P("gameTypeClass")); nextText = source.GetText(P("gameTypeClass"));
if (nextText != none) { if (nextText != none) {
gameTypeClass = nextText.ToPlainString(); gameTypeClass = nextText.ToString();
} }
nextText = source.GetText(P("acronym")); nextText = source.GetText(P("acronym"));
if (nextText != none) { if (nextText != none) {
acronym = nextText.ToPlainString(); acronym = nextText.ToString();
} }
nextText = source.GetText(P("mapPrefix")); nextText = source.GetText(P("mapPrefix"));
if (nextText != none) { if (nextText != none) {
mapPrefix = nextText.ToPlainString(); mapPrefix = nextText.ToString();
} }
nextArray = source.GetDynamicArray(P("option")); nextArray = source.GetDynamicArray(P("option"));
if (nextArray == none) { if (nextArray == none) {
@ -112,11 +112,11 @@ protected function FromData(AssociativeArray source)
nextPair.value = ""; nextPair.value = "";
nextText = source.GetText(P("key")); nextText = source.GetText(P("key"));
if (nextText != none) { if (nextText != none) {
nextPair.key = nextText.ToPlainString(); nextPair.key = nextText.ToString();
} }
nextText = source.GetText(P("value")); nextText = source.GetText(P("value"));
if (nextText != none) { if (nextText != none) {
nextPair.value = nextText.ToPlainString(); nextPair.value = nextText.ToString();
} }
option[option.length] = nextPair; option[option.length] = nextPair;
} }

6
sources/VotingHandlerAdapter.uc
Unescape View File

@ -174,8 +174,8 @@ private function string BuildOptionsString(GameMode gameMode)
options = gameMode.GetOptions(); options = gameMode.GetOptions();
for (iter = options.Iterate(); !iter.HasFinished(); iter.Next()) for (iter = options.Iterate(); !iter.HasFinished(); iter.Next())
{ {
nextKey = Text(iter.GetKey()).ToPlainString(); nextKey = Text(iter.GetKey()).ToString();
nextValue = Text(iter.Get()).ToPlainString(); nextValue = Text(iter.Get()).ToString();
if (optionWasAdded) { if (optionWasAdded) {
result $= "?"; result $= "?";
} }
@ -227,7 +227,7 @@ public final function PrepareForServerTravel()
nextGameClass = class<GameInfo>(_.memory.LoadClassS(nextGameClassName)); nextGameClass = class<GameInfo>(_.memory.LoadClassS(nextGameClassName));
} }
default.isServerTraveling = true; default.isServerTraveling = true;
default.targetGameMode = availableGameModes[pickedVHConfig].ToPlainString(); default.targetGameMode = availableGameModes[pickedVHConfig].ToString();
nextGameMode = GetConfigFromString(default.targetGameMode); nextGameMode = GetConfigFromString(default.targetGameMode);
default.storedGameDifficulty = nextGameClass.default.gameDifficulty; default.storedGameDifficulty = nextGameClass.default.gameDifficulty;
nextGameClass.default.gameDifficulty = GetNumericDifficulty(nextGameMode); nextGameClass.default.gameDifficulty = GetNumericDifficulty(nextGameMode);