From 0adbb8d631b95f174a5a86224f66c076a63fd119 Mon Sep 17 00:00:00 2001
From: vidaritos <31620802+vidaritos@users.noreply.github.com>
Date: Fri, 18 Sep 2020 17:53:45 +0200
Subject: [PATCH] pass ScriptPosition down to color parser functions

---
 src/scripting/thingdef.h              | 4 ++--
 src/scripting/thingdef_properties.cpp | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/scripting/thingdef.h b/src/scripting/thingdef.h
index 4acd0e905..c5ac2432d 100644
--- a/src/scripting/thingdef.h
+++ b/src/scripting/thingdef.h
@@ -324,7 +324,7 @@ int MatchString (const char *in, const char **strings);
 #define PROP_DOUBLE_PARM(var, no) \
 	double var = params[(no)+1].d;
 
-#define PROP_COLOR_PARM(var, no) \
-	int var = params[(no)+1].i== 0? params[(no)+2].i : V_GetColor(NULL, params[(no)+2].s);
+#define PROP_COLOR_PARM(var, no, scriptpos) \
+	int var = params[(no)+1].i== 0? params[(no)+2].i : V_GetColor(NULL, params[(no)+2].s, scriptpos);
 
 #endif
diff --git a/src/scripting/thingdef_properties.cpp b/src/scripting/thingdef_properties.cpp
index 633e43bdb..6047344dc 100644
--- a/src/scripting/thingdef_properties.cpp
+++ b/src/scripting/thingdef_properties.cpp
@@ -766,7 +766,7 @@ DEFINE_PROPERTY(translation, L, Actor)
 //==========================================================================
 DEFINE_PROPERTY(stencilcolor, C, Actor)
 {
-	PROP_COLOR_PARM(color, 0);
+	PROP_COLOR_PARM(color, 0, &bag.ScriptPosition);
 
 	defaults->fillcolor = color | (ColorMatcher.Pick (RPART(color), GPART(color), BPART(color)) << 24);
 }
@@ -776,7 +776,7 @@ DEFINE_PROPERTY(stencilcolor, C, Actor)
 //==========================================================================
 DEFINE_PROPERTY(bloodcolor, C, Actor)
 {
-	PROP_COLOR_PARM(color, 0);
+	PROP_COLOR_PARM(color, 0, &bag.ScriptPosition);
 
 	defaults->BloodColor = color;
 	defaults->BloodColor.a = 255;	// a should not be 0.
@@ -1608,7 +1608,7 @@ DEFINE_CLASS_PROPERTY_PREFIX(player, crouchsprite, S, PlayerPawn)
 //==========================================================================
 DEFINE_CLASS_PROPERTY_PREFIX(player, damagescreencolor, Cfs, PlayerPawn)
 {
-	PROP_COLOR_PARM(c, 0);
+	PROP_COLOR_PARM(c, 0, &bag.ScriptPosition);
 
 	PalEntry color = c;