Browse Source

Change to new AcediaCore collections

new
Anton Tarasenko 2 years ago
parent
commit
83f137c063
  1. 8
      sources/GameModes/GameMode.uc
  2. 7
      sources/VotingHandlerAdapter.uc

8
sources/GameModes/GameMode.uc

@ -167,13 +167,13 @@ public function ReportBadOptions()
}
/**
* @return Server options as key-value pairs in an `AssociativeArray`.
* @return Server options as key-value pairs in an `HashTable`.
*/
public function AssociativeArray GetOptions()
public function HashTable GetOptions()
{
local int i;
local AssociativeArray result;
result = _.collections.EmptyAssociativeArray();
local HashTable result;
result = _.collections.EmptyHashTable();
for (i = 0; i < option.length; i += 1)
{
if (!ValidateServerURLName(option[i].key)) continue;

7
sources/VotingHandlerAdapter.uc

@ -170,19 +170,18 @@ private function string BuildOptionsString(GameMode gameMode)
local string result;
local string nextKey, nextValue;
local CollectionIterator iter;
local AssociativeArray options;
local HashTable options;
options = gameMode.GetOptions();
for (iter = options.Iterate(); !iter.HasFinished(); iter.Next())
{
nextKey = Text(iter.GetKey()).ToString();
nextValue = Text(iter.Get()).ToString();
nextKey = _.text.ToString(Text(iter.GetKey()));
nextValue = _.text.ToString(Text(iter.Get()));
if (optionWasAdded) {
result $= "?";
}
result $= (nextKey $ "=" $ nextValue);
optionWasAdded = true;
}
options.Empty(true);
options.FreeSelf();
iter.FreeSelf();
return result;