From 7c69a71448813eda30b027e850a268f05e838973 Mon Sep 17 00:00:00 2001 From: Regynate <64607261+Regynate@users.noreply.github.com> Date: Thu, 13 Feb 2025 00:51:07 +0300 Subject: [PATCH] Miscellaneous fixes (#3714) --- ChaosMod/Util/OptionsFile.h | 4 ++-- ConfigApp/Workshop/WorkshopEditDialog.xaml.cs | 2 +- ConfigApp/Workshop/WorkshopSubmissionItem.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChaosMod/Util/OptionsFile.h b/ChaosMod/Util/OptionsFile.h index 76812b71f..f6c2a0e7c 100644 --- a/ChaosMod/Util/OptionsFile.h +++ b/ChaosMod/Util/OptionsFile.h @@ -19,7 +19,7 @@ class OptionsFile public: OptionsFile(const char *fileName, std::vector compatFileNames = {}) - : m_FileName(fileName), m_FoundFileName(""), m_CompatFileNames(compatFileNames) + : m_FileName(fileName), m_FoundFileName(fileName), m_CompatFileNames(compatFileNames) { Reset(); } @@ -73,7 +73,7 @@ class OptionsFile std::ofstream file(m_FoundFileName, std::ofstream::out | std::ofstream::trunc); if (!file) { - LOG("Couldn't write config file " << m_FileName); + LOG("Couldn't write config file " << m_FoundFileName); return; } for (auto &[key, value] : m_Options) diff --git a/ConfigApp/Workshop/WorkshopEditDialog.xaml.cs b/ConfigApp/Workshop/WorkshopEditDialog.xaml.cs index 9be4ebde4..df7ee4174 100644 --- a/ConfigApp/Workshop/WorkshopEditDialog.xaml.cs +++ b/ConfigApp/Workshop/WorkshopEditDialog.xaml.cs @@ -137,7 +137,7 @@ string handleEffectId(string itemName) if (file.Type == WorkshopSubmissionFileType.Sound) { var effectId = itemName; - if (!Effects.EffectsMap.ContainsKey(effectId)) + if (!Effects.EffectsMap.ContainsKey(effectId) && itemName.Length > 4) effectId = itemName[..^4]; if (Effects.EffectsMap.ContainsKey(effectId)) itemName += $" ({Effects.EffectsMap[effectId].Name})"; diff --git a/ConfigApp/Workshop/WorkshopSubmissionItem.cs b/ConfigApp/Workshop/WorkshopSubmissionItem.cs index c78b799af..76c4bee2c 100644 --- a/ConfigApp/Workshop/WorkshopSubmissionItem.cs +++ b/ConfigApp/Workshop/WorkshopSubmissionItem.cs @@ -156,7 +156,7 @@ public void UpdateSearchTerms() { foreach (var line in File.ReadAllLines(m_FileHandler.SubmissionDirectory + file.Name)) { - var match = Regex.Match(line, @"(?:Name|ScriptId)\s*=\s*""((?:\\""|[^""])+)"""); + var match = Regex.Match(line, @"(?:Name|ScriptId|EffectId)\s*=\s*""((?:\\""|[^""])+)"""); if (match.Success) { SearchTerms.Add(new(match.Groups[1].Value, file.Name));