ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-14 20:54:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make CopySettings save even for unused settings.

Browse source
This commit is contained in:
Ottermandias 2024-01-20 13:12:08 +01:00
parent 8c763d5379
commit c752835d2c
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Penumbra/Collections/Manager/CollectionEditor.cs
View file

@ -156,9 +156,14 @@ public class CollectionEditor
// Either copy the unused source settings directly if they are not inheriting, // Either copy the unused source settings directly if they are not inheriting,
// or remove any unused settings for the target if they are inheriting. // or remove any unused settings for the target if they are inheriting.
if (savedSettings != null) if (savedSettings != null)
{
((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings)[targetName] = savedSettings.Value; ((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings)[targetName] = savedSettings.Value;
else _saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings).Remove(targetName); }
else if (((Dictionary<string, ModSettings.SavedSettings>)collection.UnusedSettings).Remove(targetName))
{
_saveService.QueueSave(new ModCollectionSave(_modStorage, collection));
}
} }
return true; return true;

4
Penumbra/Interop/Hooks/Objects/CharacterBaseDestructor.cs
View file

@ -10,10 +10,10 @@ public sealed unsafe class CharacterBaseDestructor : EventWrapperPtr<CharacterBa
{ {
public enum Priority public enum Priority
{ {
/// <seealso cref="PathResolving.DrawObjectState"/> /// <seealso cref="PathResolving.DrawObjectState.OnCharacterBaseDestructor"/>
DrawObjectState = 0, DrawObjectState = 0,
/// <seealso cref="ModEditWindow.MtrlTab"/> /// <seealso cref="ModEditWindow.MtrlTab.UnbindFromDrawObjectMaterialInstances"/>
MtrlTab = -1000, MtrlTab = -1000,
} }

1
Penumbra/Interop/PathResolving/DrawObjectState.cs
View file

@ -3,7 +3,6 @@ using FFXIVClientStructs.FFXIV.Client.Game.Character;
using FFXIVClientStructs.FFXIV.Client.Game.Object; using FFXIVClientStructs.FFXIV.Client.Game.Object;
using FFXIVClientStructs.FFXIV.Client.Graphics.Scene; using FFXIVClientStructs.FFXIV.Client.Graphics.Scene;
using OtterGui.Services; using OtterGui.Services;
using Penumbra.Interop.Hooks;
using Object = FFXIVClientStructs.FFXIV.Client.Graphics.Scene.Object; using Object = FFXIVClientStructs.FFXIV.Client.Graphics.Scene.Object;
using Penumbra.GameData.Structs; using Penumbra.GameData.Structs;
using Penumbra.Interop.Hooks.Objects; using Penumbra.Interop.Hooks.Objects;