mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix: finding closest controller targets

pull/6494/head
Blazej Mcszk 3 years ago
parent
7b06703842
commit
5dd2fa560c
1 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      Source/controls/plrctrls.cpp

14
Source/controls/plrctrls.cpp
Unescape View File

@ -257,8 +257,8 @@ bool CanTargetMonster(const Monster &monster)
void FindRangedTarget() void FindRangedTarget()
{ {
int rotations = 0; int rotations = 4;
int distance = 0; int distance = 25;
bool canTalk = false; bool canTalk = false;
for (size_t i = 0; i < ActiveMonsterCount; i++) { for (size_t i = 0; i < ActiveMonsterCount; i++) {
@ -290,7 +290,7 @@ void FindMeleeTarget()
{ {
bool visited[MAXDUNX][MAXDUNY] = { {} }; bool visited[MAXDUNX][MAXDUNY] = { {} };
int maxSteps = 25; // Max steps for FindPath is 25 int maxSteps = 25; // Max steps for FindPath is 25
int rotations = 0; int rotations = 4;
bool canTalk = false; bool canTalk = false;
struct SearchNode { struct SearchNode {
@ -369,8 +369,8 @@ void CheckMonstersNearby()
void CheckPlayerNearby() void CheckPlayerNearby()
{ {
int newDdistance; int newDdistance;
int rotations = 0; int rotations = 4;
int distance = 0; int distance = 25;
if (pcursmonst != -1) if (pcursmonst != -1)
return; return;
@ -425,8 +425,8 @@ void FindActor()
void FindTrigger() void FindTrigger()
{ {
int rotations = 0; int rotations = 4;
int distance = 0; int distance = 25;
if (pcursitem != -1 || ObjectUnderCursor != nullptr) if (pcursitem != -1 || ObjectUnderCursor != nullptr)
return; // Prefer showing items/objects over triggers (use of cursm* conflicts) return; // Prefer showing items/objects over triggers (use of cursm* conflicts)

Write Preview
Loading…
Cancel
Save