Browse Source

Fix lint

pull/8486/head
Yuri Pourre 2 weeks ago
parent
commit
f62f809264
  1. 8
      Source/accessibility/location_speech.cpp
  2. 1
      Source/accessibility/speech.cpp
  3. 25
      Source/accessibility/tracker.cpp
  4. 2
      Source/engine/sound_position.hpp

8
Source/accessibility/location_speech.cpp

@ -175,8 +175,7 @@ std::optional<std::vector<int8_t>> 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<std::vector<int8_t>> 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];

1
Source/accessibility/speech.cpp

@ -19,7 +19,6 @@
#endif
#include <fmt/format.h>
#include "controls/plrctrls.h"
#include "engine/sound.h"
#include "inv.h"

25
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;

2
Source/engine/sound_position.hpp

@ -6,4 +6,4 @@ namespace devilution {
bool CalculateSoundPosition(Point soundPosition, int *plVolume, int *plPan);
} // namespace devilution
} // namespace devilution
Loading…
Cancel
Save