Fixed an issue where unnecessary path updates could finish spontaneously, overriding a valid path update and resulting in the actor going back into sentry mode and staying idle

Causeless · Causeless · commit 7c75cd979ad8 · 2024-08-20T01:14:23.000+01:00
diff --git a/Data/Base.rte/AI/HumanBehaviors.lua b/Data/Base.rte/AI/HumanBehaviors.lua
@@ -1852,7 +1852,7 @@ function HumanBehaviors.GoToWpt(AI, Owner, Abort)
 											local Trace = SceneMan:ShortestDistance(Owner.Head.Pos, FallPos, false);
 											SceneMan:CastObstacleRay(Owner.Head.Pos, Trace, FallPos, Vector(), Owner.ID, Owner.IgnoresWhichTeam, rte.grassID, 3);
 
-											local deltaToJump = 25;
+											local deltaToJump = 15;
 											if Owner.Jetpack.JetpackType == AEJetpack.JumpPack then
 												deltaToJump = deltaToJump * 1.4;
 											end
diff --git a/Source/Activities/GameActivity.cpp b/Source/Activities/GameActivity.cpp
@@ -1330,8 +1330,6 @@ void GameActivity::Update() {
 			if (m_PlayerController[player].IsState(PRESS_SECONDARY) || m_PlayerController[player].IsState(ACTOR_NEXT_PREP) || m_PlayerController[player].IsState(ACTOR_PREV_PREP)) {
 				// Stop drawing the waypoints
 				//                m_ControlledActor[player]->DrawWaypoints(false);
-				// Update the player's move path now to the first waypoint set
-				m_ControlledActor[player]->UpdateMovePath();
 				// Give player control back to actor
 				m_ControlledActor[player]->GetController()->SetDisabled(false);
 				// Switch back to normal view
@@ -1351,8 +1349,7 @@ void GameActivity::Update() {
 				// Just pointing into somewhere in the scene, so give that command
 				else
 					m_ControlledActor[player]->AddAISceneWaypoint(m_ActorCursor[player]);
-				// Update the player's move path now to the first waypoint set
-				m_ControlledActor[player]->UpdateMovePath();
+
 				if (m_pLastMarkedActor[player] && m_pLastMarkedActor[player]->GetPieMenu()) {
 					m_pLastMarkedActor[player]->GetPieMenu()->SetAnimationModeToNormal();
 				}
@@ -1439,7 +1436,6 @@ void GameActivity::Update() {
 								pActor->ClearAIWaypoints();
 								pActor->SetAIMode(Actor::AIMODE_SQUAD);
 								pActor->AddAIMOWaypoint(m_ControlledActor[player]);
-								pActor->UpdateMovePath(); // Make sure pActor has m_ControlledActor registered as an AIMOWaypoint
 							}
 					}
 
diff --git a/Source/Entities/ACrab.cpp b/Source/Entities/ACrab.cpp
@@ -581,7 +581,6 @@ bool ACrab::HandlePieCommand(PieSliceType pieSliceIndex) {
 		} else if (pieSliceIndex == PieSliceType::GoTo) {
 			m_AIMode = AIMODE_GOTO;
 			ClearAIWaypoints();
-			m_UpdateMovePath = true;
 		} else {
 			return Actor::HandlePieCommand(pieSliceIndex);
 		}
@@ -1257,34 +1256,6 @@ void ACrab::Update() {
 	if (m_Vel.MagnitudeIsGreaterThan(10.0F))
 		m_ViewPoint += m_Vel * std::sqrt(m_Vel.GetMagnitude() * 0.1F);
 
-	/* Done by pie menu now, see HandlePieCommand()
-	    ////////////////////////////////////////
-	    // AI mode setting
-
-	    if (m_Controller.IsState(AI_MODE_SET))
-	    {
-	        if (m_Controller.IsState(PRESS_RIGHT))
-	        {
-	            m_AIMode = AIMODE_BRAINHUNT;
-	            m_UpdateMovePath = true;
-	        }
-	        else if (m_Controller.IsState(PRESS_LEFT))
-	        {
-	            m_AIMode = AIMODE_PATROL;
-	        }
-	        else if (m_Controller.IsState(PRESS_UP))
-	        {
-	            m_AIMode = AIMODE_SENTRY;
-	        }
-	        else if (m_Controller.IsState(PRESS_DOWN))
-	        {
-	            m_AIMode = AIMODE_GOLDDIG;
-	        }
-
-	        m_DeviceState = SCANNING;
-	    }
-	*/
-
 	////////////////////////////////////////
 	// Balance stuff
 
diff --git a/Source/Entities/ACraft.cpp b/Source/Entities/ACraft.cpp
@@ -406,7 +406,6 @@ bool ACraft::HandlePieCommand(PieSliceType pieSliceIndex) {
 			m_AIMode = AIMODE_GOTO;
 			m_DeliveryState = FALL;
 			ClearAIWaypoints();
-			m_UpdateMovePath = true;
 		} else if (pieSliceIndex == PieSliceType::Scuttle) {
 			m_AIMode = AIMODE_SCUTTLE;
 		} else {
diff --git a/Source/Entities/AHuman.cpp b/Source/Entities/AHuman.cpp
@@ -597,7 +597,6 @@ bool AHuman::HandlePieCommand(PieSliceType pieSliceIndex) {
 		} else if (pieSliceIndex == PieSliceType::GoTo) {
 			m_AIMode = AIMODE_GOTO;
 			ClearAIWaypoints();
-			m_UpdateMovePath = true;
 		} else if (pieSliceIndex == PieSliceType::GoldDig) {
 			m_AIMode = AIMODE_GOLDDIG;
 		} else {
diff --git a/Source/Entities/Activity.cpp b/Source/Entities/Activity.cpp
@@ -682,8 +682,6 @@ void Activity::ReassignSquadLeader(const int player, const int team) {
 				if (actor && (actor->GetAIMode() == Actor::AIMODE_SQUAD) && (actor->GetAIMOWaypointID() == leaderID) && !actor->GetController()->IsPlayerControlled() && !actor->IsInGroup("Brains")) {
 					actor->ClearAIWaypoints();
 					actor->AddAIMOWaypoint(m_ControlledActor[player]);
-					// Make sure actor has m_ControlledActor registered as an AIMOWaypoint
-					actor->UpdateMovePath();
 				} else if (actor && actor->GetID() == leaderID) {
 					// Set the old leader to follow the controlled actor and inherit his AI mode
 					m_ControlledActor[player]->ClearAIWaypoints();
@@ -703,8 +701,6 @@ void Activity::ReassignSquadLeader(const int player, const int team) {
 					actor->ClearAIWaypoints();
 					actor->SetAIMode(Actor::AIMODE_SQUAD);
 					actor->AddAIMOWaypoint(m_ControlledActor[player]);
-					// Make sure actor has m_ControlledActor registered as an AIMOWaypoint
-					actor->UpdateMovePath();
 				}
 				actor = g_MovableMan.GetNextTeamActor(team, actor);
 			} while (actor && actor != m_ControlledActor[player]);
diff --git a/Source/Entities/Actor.cpp b/Source/Entities/Actor.cpp
@@ -109,7 +109,7 @@ void Actor::Clear() {
 	m_PrevPathTarget.Reset();
 	m_MoveVector.Reset();
 	m_MovePath.clear();
-	m_UpdateMovePath = true;
+	m_UpdateMovePath = false;
 	m_MoveProximityLimit = 20.0F;
 	m_AIBaseDigStrength = c_PathFindingDefaultDigStrength;
 	m_BaseMass = std::numeric_limits<float>::infinity();
@@ -135,7 +135,6 @@ int Actor::Create() {
 	// Default to an interesting AI controller mode
 	m_Controller.SetInputMode(Controller::CIM_AI);
 	m_Controller.SetControlledActor(this);
-	m_UpdateMovePath = true;
 
 	m_ViewPoint = m_Pos;
 	m_HUDStack = -m_CharHeight / 2;
@@ -1098,7 +1097,7 @@ void Actor::Update() {
 	///////////////////////////////////////////////////////////////////////////////
 	// Check for manual player-made progress made toward the set AI goal
 
-	if ((m_AIMode == AIMODE_GOTO || m_AIMode == AIMODE_SQUAD) && m_Controller.IsPlayerControlled() && !m_Controller.IsDisabled()) {
+	if ((m_AIMode == AIMODE_GOTO || m_AIMode == AIMODE_SQUAD) && (!m_PathRequest || m_PathRequest->complete) && m_Controller.IsPlayerControlled() && !m_Controller.IsDisabled()) {
 		Vector notUsed;
 		// See if we are close enough to the next move target that we should grab the next in the path that is out of proximity range
 		Vector pathPointVec;
diff --git a/Source/Entities/Actor.h b/Source/Entities/Actor.h
@@ -639,9 +639,6 @@ namespace RTE {
 		/// @return The number of waypoints in the MovePath.
 		int GetMovePathSize() const { return m_MovePath.size(); }
 
-		/// Starts updating this Actor's movepath.
-		virtual void UpdateMovePath();
-
 		/// Returns whether we're waiting on a new pending movepath.
 		/// @return Whether we're waiting on a new pending movepath.
 		bool IsWaitingOnNewMovePath() const { return m_PathRequest != nullptr || m_UpdateMovePath; }
@@ -808,6 +805,9 @@ namespace RTE {
 		/// This processes and cleans up the movepath.
 		virtual void OnNewMovePath();
 
+		/// Starts updating this Actor's movepath.
+		virtual void UpdateMovePath();
+
 		// Member variables
 		static Entity::ClassInfo m_sClass;
 
