From f62f8092647a59308707f63ddd1db3f7434eff9b Mon Sep 17 00:00:00 2001 From: Yuri Pourre Date: Sat, 28 Feb 2026 18:33:17 -0800 Subject: [PATCH] Fix lint --- Source/accessibility/location_speech.cpp | 8 +++----- Source/accessibility/speech.cpp | 1 - Source/accessibility/tracker.cpp | 25 +++++------------------- Source/engine/sound_position.hpp | 2 +- 4 files changed, 9 insertions(+), 27 deletions(-) diff --git a/Source/accessibility/location_speech.cpp b/Source/accessibility/location_speech.cpp index e4fbfcf92..ed6a311fc 100644 --- a/Source/accessibility/location_speech.cpp +++ b/Source/accessibility/location_speech.cpp @@ -175,8 +175,7 @@ std::optional> FindKeyboardWalkPathForSpeechBfs(const Player const int8_t yDir = delta.deltaY > 0 ? WALK_SW : (delta.deltaY < 0 ? WALK_NE : WALK_NONE); if (allowDiagonalSteps && delta.deltaX != 0 && delta.deltaY != 0) { - const int8_t diagDir = - delta.deltaX > 0 ? (delta.deltaY > 0 ? WALK_S : WALK_E) : (delta.deltaY > 0 ? WALK_W : WALK_N); + const int8_t diagDir = delta.deltaX > 0 ? (delta.deltaY > 0 ? WALK_S : WALK_E) : (delta.deltaY > 0 ? WALK_W : WALK_N); addUniqueDir(diagDir); } @@ -330,8 +329,7 @@ std::optional> FindKeyboardWalkPathToClosestReachableForSpee const int8_t yDir = delta.deltaY > 0 ? WALK_SW : (delta.deltaY < 0 ? WALK_NE : WALK_NONE); if (allowDiagonalSteps && delta.deltaX != 0 && delta.deltaY != 0) { - const int8_t diagDir = - delta.deltaX > 0 ? (delta.deltaY > 0 ? WALK_S : WALK_E) : (delta.deltaY > 0 ? WALK_W : WALK_N); + const int8_t diagDir = delta.deltaX > 0 ? (delta.deltaY > 0 ? WALK_S : WALK_E) : (delta.deltaY > 0 ? WALK_W : WALK_N); addUniqueDir(diagDir); } @@ -1155,7 +1153,7 @@ void SpeakNearestExitKeyPressed() } const int triggerIndex = FindLockedTownDungeonTriggerIndex(dungeonCandidates) - .value_or(FindDefaultTownDungeonTriggerIndex(dungeonCandidates).value_or(dungeonCandidates.front())); + .value_or(FindDefaultTownDungeonTriggerIndex(dungeonCandidates).value_or(dungeonCandidates.front())); LockedTownDungeonTriggerIndex = triggerIndex; const TriggerStruct &trigger = trigs[triggerIndex]; diff --git a/Source/accessibility/speech.cpp b/Source/accessibility/speech.cpp index d8503b03a..9eeed9406 100644 --- a/Source/accessibility/speech.cpp +++ b/Source/accessibility/speech.cpp @@ -19,7 +19,6 @@ #endif #include - #include "controls/plrctrls.h" #include "engine/sound.h" #include "inv.h" diff --git a/Source/accessibility/tracker.cpp b/Source/accessibility/tracker.cpp index e3332466e..80e381d9f 100644 --- a/Source/accessibility/tracker.cpp +++ b/Source/accessibility/tracker.cpp @@ -1750,42 +1750,27 @@ void AutoWalkToTrackerTargetKeyPressed() break; } case TrackerTargetCategory::Chests: - targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, - IsTrackedChestObject, FindNearestUnopenedChestObjectId, - [](int id) -> StringOrView { return Objects[id].name(); }, - N_("No chests found."), targetName); + targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, IsTrackedChestObject, FindNearestUnopenedChestObjectId, [](int id) -> StringOrView { return Objects[id].name(); }, N_("No chests found."), targetName); if (!targetId) return; break; case TrackerTargetCategory::Doors: - targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, - IsTrackedDoorObject, FindNearestDoorObjectId, - [](int id) -> StringOrView { return DoorLabelForSpeech(Objects[id]); }, - N_("No doors found."), targetName); + targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, IsTrackedDoorObject, FindNearestDoorObjectId, [](int id) -> StringOrView { return DoorLabelForSpeech(Objects[id]); }, N_("No doors found."), targetName); if (!targetId) return; break; case TrackerTargetCategory::Shrines: - targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, - IsShrineLikeObject, FindNearestShrineObjectId, - [](int id) -> StringOrView { return Objects[id].name(); }, - N_("No shrines found."), targetName); + targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, IsShrineLikeObject, FindNearestShrineObjectId, [](int id) -> StringOrView { return Objects[id].name(); }, N_("No shrines found."), targetName); if (!targetId) return; break; case TrackerTargetCategory::Objects: - targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, - IsTrackedMiscInteractableObject, FindNearestMiscInteractableObjectId, - [](int id) -> StringOrView { return Objects[id].name(); }, - N_("No objects found."), targetName); + targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, IsTrackedMiscInteractableObject, FindNearestMiscInteractableObjectId, [](int id) -> StringOrView { return Objects[id].name(); }, N_("No objects found."), targetName); if (!targetId) return; break; case TrackerTargetCategory::Breakables: - targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, - IsTrackedBreakableObject, FindNearestBreakableObjectId, - [](int id) -> StringOrView { return Objects[id].name(); }, - N_("No breakables found."), targetName); + targetId = ResolveObjectTrackerTarget(lockedTargetId, playerPosition, IsTrackedBreakableObject, FindNearestBreakableObjectId, [](int id) -> StringOrView { return Objects[id].name(); }, N_("No breakables found."), targetName); if (!targetId) return; break; diff --git a/Source/engine/sound_position.hpp b/Source/engine/sound_position.hpp index de062c59b..3602172f2 100644 --- a/Source/engine/sound_position.hpp +++ b/Source/engine/sound_position.hpp @@ -6,4 +6,4 @@ namespace devilution { bool CalculateSoundPosition(Point soundPosition, int *plVolume, int *plPan); -} // namespace devilution +} // namespace devilution \ No newline at end of file