Better & correct fix than 8cd254d

beyond-all-reason · Mar 18, 2024 · 06a2622 · 06a2622
1 parent a5f90f8
commit 06a2622
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/rts/Rendering/Env/Decals/GroundDecalHandler.cpp b/rts/Rendering/Env/Decals/GroundDecalHandler.cpp
@@ -1466,15 +1466,13 @@ void CGroundDecalHandler::GhostCreated(const CSolidObject* object, const GhostSo
 
 
 void CGroundDecalHandler::ExplosionOccurred(const CExplosionParams& event) {
-	if (!event.weaponDef)
+	if ((event.weaponDef != nullptr) && !event.weaponDef->visuals.explosionScar)
 		return;
 
-	if (!event.weaponDef->visuals.explosionScar)
-		return;
-
-	const auto decalDir = event.weaponDef->visuals.scarProjVector.w == 0.0f ?
-		CGround::GetNormal(event.pos.x, event.pos.z, false) :
-		float3{ event.weaponDef->visuals.scarProjVector };
+	const bool hasForcedProjVec = (event.weaponDef != nullptr && event.weaponDef->visuals.scarProjVector.w != 0.0f);
+	const auto decalDir = hasForcedProjVec ?
+		float3{ event.weaponDef->visuals.scarProjVector } :
+		CGround::GetNormal(event.pos.x, event.pos.z, false);
 
 	AddExplosion(std::move(AddExplosionInfo{
 		event.pos,