Merge branch 'development' into glowsoneverything

Author: Causeless

CHANGELOG.md

@@ -30,13 +30,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 - Fixed a crash that could occur when using the Nucleo Swarm weapon.
 
+- Fixed a crash that could occur when mods applied an invalid team to an Actor.
+
 - Fixed a missing Lua write binding for `AEJetpack`'s `JetTimeLeft` property.
 
 - Fixed an issue where glows wouldn't render if the EffectStopTime was lower than the simulation deltatime.
 
 - Fixed an issue where sometimes doors were owned by the wrong team in Bunker Breach and Survival activities.
 
-- Fixed an issue where a mission-only item was being bought by the AI.
+- Fixed an issue where a mission-specific keycard item was being bought by the AI.
+
+- Fixed `MovableObject` INI and Lua property `IgnoreTerrain` not having any appreciable effect.
 
 </details>
 
@@ -85,10 +89,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 </details>
 
-<details><summary><b>Removed</b></summary>
-
-</details>
-
 ## [Release v6.0.0] - 2024/02/11
 
 <details><summary><b>Added</b></summary>

RTEA.vcxproj

@@ -213,9 +213,9 @@
     <ClCompile>
       <AdditionalOptions Condition="'$(VisualStudioVersion)'=='16.0'">/bigobj /Zm300 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)'=='17.0'">/bigobj %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)\Source;$(ProjectDir)Source\System;$(ProjectDir)Source\Lua;$(ProjectDir)Source\Entities;$(ProjectDir)Source\Activities;$(ProjectDir)Source\Managers;$(ProjectDir)Source\Menus;$(ProjectDir)Source\GUI;$(ProjectDir)Source\GUI\Wrappers;$(ProjectDir)external\include\boost_1_75;$(ProjectDir)external\include\glm-0.9.9.8;$(ProjectDir)external\include\glad-2.0.0-beta;$(ProjectDir)external\include\LZ4-1.9.3\LZ4;$(ProjectDir)external\include\fmod-2.2.13;$(ProjectDir)external\include\thread-pool-3.5.0\include;$(ProjectDir)external\include\hopscotch-map-2.3.1\include;$(ProjectDir)external\sources\libpng-1.6.40\include;$(ProjectDir)external\sources\zlib-ng-2.1.3\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\include;$(ProjectDir)external\sources\allegro 4.4.3.1-custom\addons\loadpng;$(ProjectDir)external\sources\SDL2-2.26.3\include;$(ProjectDir)external\sources\LuaJIT-2.1\src;$(ProjectDir)external\sources\luabind-0.7.1\;$(ProjectDir)external\sources\luabind-0.7.1\luabind;$(ProjectDir)external\sources\RakNet\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\include;$(ProjectDir)external\sources\minizip-ng-4.0.0\src;$(ProjectDir)external\sources\tracy\public</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;TRACY_ENABLE;TRACY_ON_DEMAND;DEBUG_BUILD;DEBUGMODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_ITERATOR_DEBUG_LEVEL=0;ZLIB_COMPAT;_WINDOWS;WIN32;DEBUG_BUILD;DEBUGMODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

Source/Entities/Scene.cpp

@@ -2313,17 +2313,17 @@ int Scene::SetOwnerOfAllDoors(int team, int player) {
 }
 
 void Scene::ResetPathFinding() {
-	GetPathFinder(Activity::Teams::NoTeam)->RecalculateAllCosts();
+	GetPathFinder(Activity::Teams::NoTeam).RecalculateAllCosts();
 	for (int team = Activity::Teams::TeamOne; team < Activity::Teams::MaxTeamCount; ++team) {
 		g_MovableMan.OverrideMaterialDoors(true, team);
-		GetPathFinder(static_cast<Activity::Teams>(team))->RecalculateAllCosts();
+		GetPathFinder(static_cast<Activity::Teams>(team)).RecalculateAllCosts();
 		g_MovableMan.OverrideMaterialDoors(false, team);
 	}
 }
 
 void Scene::BlockUntilAllPathingRequestsComplete() {
 	for (int team = Activity::Teams::NoTeam; team < Activity::Teams::MaxTeamCount; ++team) {
-		while (GetPathFinder(static_cast<Activity::Teams>(team))->GetCurrentPathingRequests() != 0) {};
+		while (GetPathFinder(static_cast<Activity::Teams>(team)).GetCurrentPathingRequests() != 0) {};
 	}
 }
 
@@ -2337,7 +2337,7 @@ void Scene::UpdatePathFinding() {
 	// TODO: this can indefinitely block updates if pathing requests are made every frame. Figure out a solution for this
 	// Either force-complete pathing requests occasionally, or delay starting new pathing requests if we've not updated in a while
 	for (int team = Activity::Teams::NoTeam; team < Activity::Teams::MaxTeamCount; ++team) {
-		if (GetPathFinder(static_cast<Activity::Teams>(team))->GetCurrentPathingRequests() != 0) {
+		if (GetPathFinder(static_cast<Activity::Teams>(team)).GetCurrentPathingRequests() != 0) {
 			return;
 		};
 	}
@@ -2349,7 +2349,7 @@ void Scene::UpdatePathFinding() {
 	}
 
 	// Update our shared pathFinder
-	std::vector<int> updatedNodes = GetPathFinder(Activity::Teams::NoTeam)->RecalculateAreaCosts(m_pTerrain->GetUpdatedMaterialAreas(), nodesToUpdate);
+	std::vector<int> updatedNodes = GetPathFinder(Activity::Teams::NoTeam).RecalculateAreaCosts(m_pTerrain->GetUpdatedMaterialAreas(), nodesToUpdate);
 	if (!updatedNodes.empty()) {
 		// Update each team's pathFinder
 		for (int team = Activity::Teams::TeamOne; team < Activity::Teams::MaxTeamCount; ++team) {
@@ -2360,7 +2360,7 @@ void Scene::UpdatePathFinding() {
 			// Remove the material representation of all doors of this team so we can navigate through them (they'll open for us).
 			g_MovableMan.OverrideMaterialDoors(true, team);
 
-			GetPathFinder(static_cast<Activity::Teams>(team))->UpdateNodeList(updatedNodes);
+			GetPathFinder(static_cast<Activity::Teams>(team)).UpdateNodeList(updatedNodes);
 
 			// Place back the material representation of all doors of this team so they are as we found them.
 			g_MovableMan.OverrideMaterialDoors(false, team);
@@ -2373,23 +2373,14 @@ void Scene::UpdatePathFinding() {
 
 float Scene::CalculatePath(const Vector& start, const Vector& end, std::list<Vector>& pathResult, float digStrength, Activity::Teams team) {
 	float totalCostResult = -1;
+	int result = GetPathFinder(team).CalculatePath(start, end, pathResult, totalCostResult, digStrength);
 
-	if (const std::unique_ptr<PathFinder>& pathFinder = GetPathFinder(team)) {
-		int result = pathFinder->CalculatePath(start, end, pathResult, totalCostResult, digStrength);
-
-		// It's ok if start and end nodes happen to be the same, the exact pixel locations are added at the front and end of the result regardless
-		return (result == micropather::MicroPather::SOLVED || result == micropather::MicroPather::START_END_SAME) ? totalCostResult : -1;
-	}
-
-	return false;
+	// It's ok if start and end nodes happen to be the same, the exact pixel locations are added at the front and end of the result regardless
+	return (result == micropather::MicroPather::SOLVED || result == micropather::MicroPather::START_END_SAME) ? totalCostResult : -1;
 }
 
 std::shared_ptr<volatile PathRequest> Scene::CalculatePathAsync(const Vector& start, const Vector& end, float digStrength, Activity::Teams team, PathCompleteCallback callback) {
-	if (const std::unique_ptr<PathFinder>& pathFinder = GetPathFinder(team)) {
-		return pathFinder->CalculatePathAsync(start, end, digStrength, callback);
-	}
-
-	return nullptr;
+	return GetPathFinder(team).CalculatePathAsync(start, end, digStrength, callback);
 }
 
 int Scene::GetScenePathSize() const {
@@ -2401,11 +2392,7 @@ std::list<Vector>& Scene::GetScenePath() {
 }
 
 bool Scene::PositionsAreTheSamePathNode(const Vector& pos1, const Vector& pos2) const {
-	if (const std::unique_ptr<PathFinder>& pathFinder = const_cast<Scene*>(this)->GetPathFinder(Activity::Teams::NoTeam)) {
-		return pathFinder->PositionsAreTheSamePathNode(pos1, pos2);
-	}
-
-	return false;
+	return const_cast<Scene*>(this)->GetPathFinder(Activity::Teams::NoTeam).PositionsAreTheSamePathNode(pos1, pos2);
 }
 
 void Scene::Lock() {
@@ -2447,7 +2434,7 @@ void Scene::Update() {
 
 		m_NavigatableAreasUpToDate = true;
 		for (int team = Activity::Teams::NoTeam; team < Activity::Teams::MaxTeamCount; ++team) {
-			PathFinder& pathFinder = *GetPathFinder(static_cast<Activity::Teams>(team));
+			PathFinder& pathFinder = GetPathFinder(static_cast<Activity::Teams>(team));
 
 			pathFinder.MarkAllNodesNavigatable(m_NavigatableAreas.empty());
 
@@ -2467,7 +2454,11 @@ void Scene::Update() {
 	}
 }
 
-std::unique_ptr<PathFinder>& Scene::GetPathFinder(Activity::Teams team) {
+PathFinder& Scene::GetPathFinder(Activity::Teams team) {
+	if (team < Activity::NoTeam || team >= Activity::MaxTeamCount) {
+		return *m_pPathFinders[0]; // Use NoTeam if a mod does something insane like applying an actor to team 6 (yes this actually happens)
+	}
+
 	// Note - we use + 1 when getting pathfinders by index, because our shared NoTeam pathfinder occupies index 0, and the rest come after that.
-	return m_pPathFinders[static_cast<int>(team) + 1];
+	return *m_pPathFinders[static_cast<int>(team) + 1];
 }

Source/Entities/Scene.h

@@ -810,8 +810,8 @@ namespace RTE {
 	private:
 		/// Gets the pathfinder for a given team.
 		/// @param team The team to get the pathfinder for. NoTeam is valid, and will give a shared pathfinder.
-		/// @return A pointer to the pathfinder for the given team.
-		std::unique_ptr<PathFinder>& GetPathFinder(Activity::Teams team);
+		/// @return A reference to the pathfinder for the given team.
+		PathFinder& GetPathFinder(Activity::Teams team);
 
 		/// Serializes the SceneObject via the Writer. Necessary because full serialization doesn't know how to deal with duplicate properties.
 		/// @param writer The Writer being used for serialization.

Source/System/Atom.cpp

@@ -552,7 +552,7 @@ bool Atom::StepForward(int numSteps) {
 			g_SceneMan.WrapPosition(m_IntPos[X], m_IntPos[Y]);
 
 			// Detect terrain hits, if not disabled.
-			if (g_MaterialAir != (m_TerrainMatHit = g_SceneMan.GetTerrMatter(m_IntPos[X], m_IntPos[Y]))) {
+			if (!m_OwnerMO->m_IgnoreTerrain && g_MaterialAir != (m_TerrainMatHit = g_SceneMan.GetTerrMatter(m_IntPos[X], m_IntPos[Y]))) {
 				// Check if we're temporarily disabled from hitting terrain
 				if (!m_TerrainHitsDisabled) {
 					m_OwnerMO->SetHitWhatTerrMaterial(m_TerrainMatHit);
@@ -766,7 +766,7 @@ int Atom::Travel(float travelTime, bool autoTravel, bool scenePreLocked) {
 		// Bresenham's line drawing algorithm execution
 		for (domSteps = 0; domSteps < delta[dom] && !(hit[X] || hit[Y]); ++domSteps) {
 			// Check for the special case if the Atom is starting out embedded in terrain. This can happen if something large gets copied to the terrain and embeds some Atoms.
-			if (domSteps == 0 && g_SceneMan.GetTerrMatter(intPos[X], intPos[Y]) != g_MaterialAir) {
+			if (!m_OwnerMO->m_IgnoreTerrain && domSteps == 0 && g_SceneMan.GetTerrMatter(intPos[X], intPos[Y]) != g_MaterialAir) {
 				++hitCount;
 				hit[X] = hit[Y] = true;
 				if (g_SceneMan.TryPenetrate(intPos[X], intPos[Y], velocity * mass * sharpness, velocity, retardation, 0.5F, m_NumPenetrations, removeOrphansRadius, removeOrphansMaxArea, removeOrphansRate)) {
@@ -902,7 +902,7 @@ int Atom::Travel(float travelTime, bool autoTravel, bool scenePreLocked) {
 			// Atom-Terrain collision detection and response.
 
 			// If there was no MO collision detected, then check for terrain hits.
-			else if ((hitMaterialID = g_SceneMan.GetTerrMatter(intPos[X], intPos[Y])) && !m_OwnerMO->m_IgnoreTerrain) {
+			else if (!m_OwnerMO->m_IgnoreTerrain && (hitMaterialID = g_SceneMan.GetTerrMatter(intPos[X], intPos[Y]))) {
 				if (hitMaterialID != g_MaterialAir) {
 					m_OwnerMO->SetHitWhatTerrMaterial(hitMaterialID);
 				}