h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 09:27:29 +08:00
Code Issues Releases Wiki Activity

Rename method to better indicate directionality

Browse Source
This commit is contained in:
Bartłomiej Dach 2023-05-04 18:15:12 +02:00
parent d1d4b54c64
commit 0d2396c557
No known key found for this signature in database
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Mods/ModSettingsTest.cs
View File

@ -45,12 +45,12 @@ namespace osu.Game.Tests.Mods
var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } }; var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change / 2 } }; var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change / 2 } };
modDouble.CopyCommonSettings(modBool); modDouble.CopyCommonSettingsFrom(modBool);
modDouble.CopyCommonSettings(modInt); modDouble.CopyCommonSettingsFrom(modInt);
modBool.CopyCommonSettings(modDouble); modBool.CopyCommonSettingsFrom(modDouble);
modBool.CopyCommonSettings(modInt); modBool.CopyCommonSettingsFrom(modInt);
modInt.CopyCommonSettings(modDouble); modInt.CopyCommonSettingsFrom(modDouble);
modInt.CopyCommonSettings(modBool); modInt.CopyCommonSettingsFrom(modBool);
Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change)); Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default)); Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
@ -63,7 +63,7 @@ namespace osu.Game.Tests.Mods
var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } }; var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } };
var modBoolFalse = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } }; var modBoolFalse = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
modBoolFalse.CopyCommonSettings(modBoolTrue); modBoolFalse.CopyCommonSettingsFrom(modBoolTrue);
Assert.That(modBoolFalse.TestSetting.Default, Is.EqualTo(false)); Assert.That(modBoolFalse.TestSetting.Default, Is.EqualTo(false));
Assert.That(modBoolFalse.TestSetting.Value, Is.EqualTo(modBoolTrue.TestSetting.Value)); Assert.That(modBoolFalse.TestSetting.Value, Is.EqualTo(modBoolTrue.TestSetting.Value));

2
osu.Game/OsuGameBase.cs
View File

@ -633,7 +633,7 @@ namespace osu.Game
var convertedMods = SelectedMods.Value.Select(mod => var convertedMods = SelectedMods.Value.Select(mod =>
{ {
var newMod = instance.CreateModFromAcronym(mod.Acronym); var newMod = instance.CreateModFromAcronym(mod.Acronym);
newMod?.CopyCommonSettings(mod); newMod?.CopyCommonSettingsFrom(mod);
return newMod; return newMod;
}).Where(newMod => newMod != null).ToList(); }).Where(newMod => newMod != null).ToList();

2
osu.Game/Rulesets/Mods/Mod.cs
View File

@ -168,7 +168,7 @@ namespace osu.Game.Rulesets.Mods
/// </summary> /// </summary>
/// <remarks>Copied values are unchanged, even if they have different clamping ranges.</remarks> /// <remarks>Copied values are unchanged, even if they have different clamping ranges.</remarks>
/// <param name="source">The mod to extract settings from.</param> /// <param name="source">The mod to extract settings from.</param>
public void CopyCommonSettings(Mod source) public void CopyCommonSettingsFrom(Mod source)
{ {
if (source.UsesDefaultConfiguration) if (source.UsesDefaultConfiguration)
return; return;