From c23ba271038a8f248e5b9e2a2ba8b9b5a240c5ba Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 14 Sep 2024 00:20:46 +0200 Subject: [PATCH] Fix warnings --- .../QuestComponents/CreationUtilsComponent.cs | 78 ++++++++++--------- .../QuestComponents/EventInfoComponent.cs | 3 + 2 files changed, 45 insertions(+), 36 deletions(-) diff --git a/Questionable/Windows/QuestComponents/CreationUtilsComponent.cs b/Questionable/Windows/QuestComponents/CreationUtilsComponent.cs index 8c7cb09b..715bc089 100644 --- a/Questionable/Windows/QuestComponents/CreationUtilsComponent.cs +++ b/Questionable/Windows/QuestComponents/CreationUtilsComponent.cs @@ -70,7 +70,7 @@ internal sealed class CreationUtilsComponent _logger = logger; } - public unsafe void Draw() + public void Draw() { Debug.Assert(_clientState.LocalPlayer != null, "_clientState.LocalPlayer != null"); @@ -90,58 +90,64 @@ internal sealed class CreationUtilsComponent } #if false - var questManager = QuestManager.Instance(); - if (questManager != null) - { - for (int i = questManager->TrackedQuests.Length - 1; i >= 0; --i) + unsafe { + var questManager = QuestManager.Instance(); + if (questManager != null) { - var trackedQuest = questManager->TrackedQuests[i]; - switch (trackedQuest.QuestType) + for (int i = questManager->TrackedQuests.Length - 1; i >= 0; --i) { - default: - ImGui.Text($"Tracked quest {i}: {trackedQuest.QuestType}, {trackedQuest.Index}"); - break; + var trackedQuest = questManager->TrackedQuests[i]; + switch (trackedQuest.QuestType) + { + default: + ImGui.Text($"Tracked quest {i}: {trackedQuest.QuestType}, {trackedQuest.Index}"); + break; - case 1: - //_questRegistry.TryGetQuest(questManager->NormalQuests[trackedQuest.Index].QuestId, - // out var quest); - ImGui.Text( - $"Quest: {questManager->NormalQuests[trackedQuest.Index].QuestId}, {trackedQuest.Index}"); - break; + case 1: + //_questRegistry.TryGetQuest(questManager->NormalQuests[trackedQuest.Index].QuestId, + // out var quest); + ImGui.Text( + $"Quest: {questManager->NormalQuests[trackedQuest.Index].QuestId}, {trackedQuest.Index}"); + break; - case 2: - ImGui.Text($"Leve: {questManager->LeveQuests[trackedQuest.Index].LeveId}, {trackedQuest.Index}"); - break; + case 2: + ImGui.Text($"Leve: {questManager->LeveQuests[trackedQuest.Index].LeveId}, {trackedQuest.Index}"); + break; + } } } } #endif #if false - var questManager = QuestManager.Instance(); - if (questManager != null) - { - for (int i = 0; i < questManager->DailyQuests.Length; ++i) + unsafe { + var questManager = QuestManager.Instance(); + if (questManager != null) { - var dailyQuest = questManager->DailyQuests[i]; - ImGui.Text($"Daily Quest {i}: {dailyQuest.QuestId}, {dailyQuest.IsCompleted}"); + for (int i = 0; i < questManager->DailyQuests.Length; ++i) + { + var dailyQuest = questManager->DailyQuests[i]; + ImGui.Text($"Daily Quest {i}: {dailyQuest.QuestId}, {dailyQuest.IsCompleted}"); + } } } #endif #if false - var director = UIState.Instance()->DirectorTodo.Director; - if (director != null) - { - ImGui.Text($"Director: {director->ContentId}"); - ImGui.Text($"Seq: {director->Sequence}"); - ImGui.Text($"Ico: {director->IconId}"); - if (director->EventHandlerInfo != null) + unsafe { + var director = UIState.Instance()->DirectorTodo.Director; + if (director != null) { - ImGui.Text($" EHI CI: {director->EventHandlerInfo->EventId.ContentId}"); - ImGui.Text($" EHI EI: {director->EventHandlerInfo->EventId.Id}"); - ImGui.Text($" EHI EEI: {director->EventHandlerInfo->EventId.EntryId}"); - ImGui.Text($" EHI F: {director->EventHandlerInfo->Flags}"); + ImGui.Text($"Director: {director->ContentId}"); + ImGui.Text($"Seq: {director->Sequence}"); + ImGui.Text($"Ico: {director->IconId}"); + if (director->EventHandlerInfo != null) + { + ImGui.Text($" EHI CI: {director->EventHandlerInfo->EventId.ContentId}"); + ImGui.Text($" EHI EI: {director->EventHandlerInfo->EventId.Id}"); + ImGui.Text($" EHI EEI: {director->EventHandlerInfo->EventId.EntryId}"); + ImGui.Text($" EHI F: {director->EventHandlerInfo->Flags}"); + } } } #endif diff --git a/Questionable/Windows/QuestComponents/EventInfoComponent.cs b/Questionable/Windows/QuestComponents/EventInfoComponent.cs index c0d84bc4..d85e1f70 100644 --- a/Questionable/Windows/QuestComponents/EventInfoComponent.cs +++ b/Questionable/Windows/QuestComponents/EventInfoComponent.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Linq; using Dalamud.Interface; @@ -18,6 +19,7 @@ namespace Questionable.Windows.QuestComponents; internal sealed class EventInfoComponent { + [SuppressMessage("ReSharper", "CollectionNeverUpdated.Local")] private readonly List _eventQuests = [ ]; @@ -45,6 +47,7 @@ internal sealed class EventInfoComponent _pluginInterface = pluginInterface; } + [SuppressMessage("ReSharper", "UnusedMember.Local")] private static DateTime AtDailyReset(DateOnly date) { return new DateTime(date, new TimeOnly(14, 59), DateTimeKind.Utc);