Rename method to better indicate directionality

CloneWith · May 4, 2023 · 0d2396c · 0d2396c
1 parent d1d4b54
commit 0d2396c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/osu.Game.Tests/Mods/ModSettingsTest.cs b/osu.Game.Tests/Mods/ModSettingsTest.cs
@@ -45,12 +45,12 @@ public void TestDifferentTypeSettingsKeptWhenCopied()
             var modBool = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = false, Value = true } };
             var modInt = new TestNonMatchingSettingTypeModInt { TestSetting = { Value = (int)setting_change / 2 } };
 
-            modDouble.CopyCommonSettings(modBool);
-            modDouble.CopyCommonSettings(modInt);
-            modBool.CopyCommonSettings(modDouble);
-            modBool.CopyCommonSettings(modInt);
-            modInt.CopyCommonSettings(modDouble);
-            modInt.CopyCommonSettings(modBool);
+            modDouble.CopyCommonSettingsFrom(modBool);
+            modDouble.CopyCommonSettingsFrom(modInt);
+            modBool.CopyCommonSettingsFrom(modDouble);
+            modBool.CopyCommonSettingsFrom(modInt);
+            modInt.CopyCommonSettingsFrom(modDouble);
+            modInt.CopyCommonSettingsFrom(modBool);
 
             Assert.That(modDouble.TestSetting.Value, Is.EqualTo(setting_change));
             Assert.That(modBool.TestSetting.Value, Is.EqualTo(!modBool.TestSetting.Default));
@@ -63,7 +63,7 @@ public void TestDefaultValueKeptWhenCopied()
             var modBoolTrue = new TestNonMatchingSettingTypeModBool { TestSetting = { Default = true, Value = false } };
             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.Value, Is.EqualTo(modBoolTrue.TestSetting.Value));

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
@@ -633,7 +633,7 @@ private void onRulesetChanged(ValueChangedEvent<RulesetInfo> r)
             var convertedMods = SelectedMods.Value.Select(mod =>
             {
                 var newMod = instance.CreateModFromAcronym(mod.Acronym);
-                newMod?.CopyCommonSettings(mod);
+                newMod?.CopyCommonSettingsFrom(mod);
                 return newMod;
             }).Where(newMod => newMod != null).ToList();
 

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