Fix Crash due to Agent dying in vehicle

Fixes Crash by implementing custom bypass when agent dying is inside a crashing vehicle
kgd192 · Sep 5, 2024 · 294dea8 · 294dea8
1 parent 667eea9
commit 294dea8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/game/state/city/vehicle.cpp b/game/state/city/vehicle.cpp
@@ -1903,8 +1903,9 @@ void Vehicle::die(GameState &state, bool silent, StateRef<Vehicle> attacker)
 	// Dying will remove agent from current agents list
 	for (auto agent : currentAgents)
 	{
-		agent->die(state, true);
+		agent->die(state, true, true);
 	}
+	currentAgents.clear();
 
 	// Adjust relationships
 	if (attacker && !crashed)

diff --git a/game/state/shared/agent.cpp b/game/state/shared/agent.cpp
@@ -943,15 +943,16 @@ bool Agent::getNewGoal(GameState &state)
 	return acquired;
 }
 
-void Agent::die(GameState &state, bool silent)
+void Agent::die(GameState &state, bool silent, bool vehicleCrash)
 {
 	auto thisRef = StateRef<Agent>{&state, shared_from_this()};
 
 	// Set health to zero so agent will die on next update
 	modified_stats.health = 0;
 
 	// Remove from vehicle
-	if (currentVehicle)
+	// Dont do while dying from a vehicle crash to prevent iterator invalidation in vehicle.cpp
+	if (currentVehicle && !vehicleCrash)
 	{
 		currentVehicle->currentAgents.erase(thisRef);
 	}

diff --git a/game/state/shared/agent.h b/game/state/shared/agent.h
@@ -190,7 +190,7 @@ class Agent : public StateObject<Agent>,
 	// Get new goal for vehicle position or facing
 	bool getNewGoal(GameState &state);
 
-	void die(GameState &state, bool silent = false);
+	void die(GameState &state, bool silent = false, bool vehicleCrash = false);
 	bool isDead() const;
 	void handleDeath(GameState &state);