Movies 2.0 - fix some stuff

This commit is contained in:
adelikat 2014-01-10 02:01:57 +00:00
parent adf7f01102
commit 34fd1ec10a
2 changed files with 10 additions and 6 deletions

View File

@ -93,6 +93,10 @@ namespace BizHawk.Client.Common
public BooleanControllerMnemonicGenerator(string name, IDictionary<string, char> mnemonics)
{
_controllerMnemonics = new NamedDictionary<string, char>(name);
foreach (var kvp in mnemonics)
{
_controllerMnemonics.Add(kvp.Key, kvp.Value);
}
}
public void Add(string key, char value)
@ -104,7 +108,7 @@ namespace BizHawk.Client.Common
{
get
{
return _controllerMnemonics.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
return _controllerMnemonics.ToDictionary(kvp => ControllerPrefix + " " + kvp.Key, kvp => kvp.Value);
}
}

View File

@ -160,16 +160,16 @@ namespace BizHawk.Client.Common
{
get
{
var kvps = new List<KeyValuePair<string, char>>();
foreach (var blah in AvailableGenerators)
var dictionary = new Dictionary<string, char>();
foreach (var generator in AvailableGenerators)
{
foreach (var blah2 in blah.AvailableMnemonics)
foreach (var mnemonic in generator.AvailableMnemonics)
{
kvps.Add(blah2);
dictionary.Add(mnemonic.Key, mnemonic.Value);
}
}
return kvps.ToDictionary(x => x.Key, x => x.Value);
return dictionary;
}
}
#endregion