Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy

This commit is contained in:
Simon Robertshaw 2011-11-26 12:45:15 +00:00
commit 047a39498d

View File

@ -359,7 +359,7 @@ int graphics_LCRY(GRAPHICS_FUNC_ARGS)
*colr += lifemod;
*colg += lifemod;
*colb += lifemod;
if(cpart->dcolour && cpart->dcolour&0xFF000000)
if(decorations_enable && cpart->dcolour && cpart->dcolour&0xFF000000)
{
lifemod *= 2.5f;
if(lifemod < 40)