Merge 2b0dac944c into 5a08031caf

Source/controls/plrctrls.cpp

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