OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Expand UDMF and ZScript API for side's own additive colors

Browse source 
Add 'useowncoloradd_{top,mid,bottom}' sidedef properties to the UDMF 
spec
Only use side's additive colors if 'useowncoloradd_(top|mid|bottom)' is 
set.
Rename UseOwnColors flag to UseOwnSpecialColors
Add UseOwnAdditiveColor flag to side_t::part
Add EnableAdditiveColor to side_t
Add Side.EnableAdditiveColor to ZScript API
This commit is contained in:
Kevin Caccamo 2018-12-23 01:36:25 -05:00 • committed by Christoph Oelckers
commit e04fc026ff
6 changed files with 65 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/p_udmf.cpp
View file

@ -1329,7 +1329,7 @@ public:
break;
case NAME_useowncolors_top:
Flag(sd->textures[side_t::top].flags, side_t::part::UseOwnColors, key);
Flag(sd->textures[side_t::top].flags, side_t::part::UseOwnSpecialColors, key);
break;
case NAME_uppercolor_top:
@ -1353,7 +1353,7 @@ public:
break;
case NAME_useowncolors_mid:
Flag(sd->textures[side_t::mid].flags, side_t::part::UseOwnColors, key);
Flag(sd->textures[side_t::mid].flags, side_t::part::UseOwnSpecialColors, key);
break;
case NAME_uppercolor_mid:
@ -1377,7 +1377,7 @@ public:
break;
case NAME_useowncolors_bottom:
Flag(sd->textures[side_t::bottom].flags, side_t::part::UseOwnColors, key);
Flag(sd->textures[side_t::bottom].flags, side_t::part::UseOwnSpecialColors, key);
break;
case NAME_uppercolor_bottom:
@ -1400,6 +1400,14 @@ public:
sd->SetAdditiveColor(side_t::bottom, CheckInt(key));
break;
case NAME_useowncoloradd_top:
sd->textures[side_t::top].flags |= side_t::part::UseOwnAdditiveColor * CheckBool(key);
case NAME_useowncoloradd_mid:
sd->textures[side_t::mid].flags |= side_t::part::UseOwnAdditiveColor * CheckBool(key);
case NAME_useowncoloradd_bottom:
sd->textures[side_t::bottom].flags |= side_t::part::UseOwnAdditiveColor * CheckBool(key);
default:
break;