From 4649d011c6f55df92238f117489bfd3dc5bcf123 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Fri, 23 May 2008 02:13:31 +0000 Subject: [PATCH] - Fixed: ActorStencilColor() did not set the palette part of the actor's fill color, so it would always produce black for STYLE_Shaded. SVN r990 (trunk) --- docs/rh-log.txt | 2 ++ src/thingdef/thingdef_properties.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index e07623a85..dea52db43 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,4 +1,6 @@ May 22, 2008 +- Fixed: ActorStencilColor() did not set the palette part of the actor's + fill color, so it would always produce black for STYLE_Shaded. - Added volume reduction for stereo sounds played in 3D to obtain levels closer to FMOD 3, which downmixed all stereo sounds to mono before playing them in 3D. Also added experimental 3D spread for stereo sounds diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp index 3bd5e2071..4537a76a9 100644 --- a/src/thingdef/thingdef_properties.cpp +++ b/src/thingdef/thingdef_properties.cpp @@ -1477,7 +1477,7 @@ static void ActorTranslation (FScanner &sc, AActor *defaults, Baggage &bag) //========================================================================== // //========================================================================== -static void ActorStencilColor (FScanner &sc,AActor *defaults, Baggage &bag) +static void ActorStencilColor (FScanner &sc, AActor *defaults, Baggage &bag) { int r,g,b; @@ -1500,7 +1500,7 @@ static void ActorStencilColor (FScanner &sc,AActor *defaults, Baggage &bag) g=GPART(c); b=BPART(c); } - defaults->fillcolor = MAKERGB(r,g,b); + defaults->fillcolor = MAKERGB(r,g,b) | (ColorMatcher.Pick (r, g, b) << 24); }