From c8fc7b2e2aa4c672ce2793d044a611c208c00e2f Mon Sep 17 00:00:00 2001
From: Rebmiami <59275598+Rebmiami@users.noreply.github.com>
Date: Tue, 12 Dec 2023 16:31:47 -0500
Subject: [PATCH] PAPR now respects deco settings and blackDecorations

---
 src/simulation/elements/PAPR.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/simulation/elements/PAPR.cpp b/src/simulation/elements/PAPR.cpp
index 5a69c6540..446779fe6 100644
--- a/src/simulation/elements/PAPR.cpp
+++ b/src/simulation/elements/PAPR.cpp
@@ -107,10 +107,20 @@ static int graphics(GRAPHICS_FUNC_ARGS)
 {
 	if (cpart->life)
 	{
-		float alpha = ((cpart->dcolour >> 24) & 0xFF) / 255.f;
-		*colr = int(*colr * (1 - alpha) + ((cpart->dcolour >> 16) & 0xFF) * alpha);
-		*colg = int(*colg * (1 - alpha) + ((cpart->dcolour >> 8) & 0xFF) * alpha);
-		*colb = int(*colb * (1 - alpha) + ((cpart->dcolour) & 0xFF) * alpha);
+		// Render deco color when marked
+		if(gfctx.ren->decorations_enable && !gfctx.ren->blackDecorations)
+		{
+			float alpha = ((cpart->dcolour >> 24) & 0xFF) / 255.f;
+			*colr = int(*colr * (1 - alpha) + ((cpart->dcolour >> 16) & 0xFF) * alpha);
+			*colg = int(*colg * (1 - alpha) + ((cpart->dcolour >> 8) & 0xFF) * alpha);
+			*colb = int(*colb * (1 - alpha) + ((cpart->dcolour) & 0xFF) * alpha);
+		}
+		else // If deco is disabled or blackDecorations is on, become a generic dark gray color
+		{
+			*colr = 20;
+			*colg = 20;
+			*colb = 20;
+		}
 	}
 	// Darken when burnt
 	float maxtemp = std::max((float)cpart->tmp2, cpart->temp);