diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-26 12:45:15 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-26 12:45:15 (GMT) |
| commit | 047a39498d46181e60e9eef4b8a0958493a28630 (patch) | |
| tree | 81f2410a2926891fbbeafcdc8034a777b53622e1 /src/elements | |
| parent | d17336b4672e72791fa1f9ac1c5e7c04bbffd831 (diff) | |
| parent | 769b26ea7e61c8fff17ef4061f7dfd742b905671 (diff) | |
| download | powder-047a39498d46181e60e9eef4b8a0958493a28630.zip powder-047a39498d46181e60e9eef4b8a0958493a28630.tar.gz | |
Merge branch 'master' of github.com:FacialTurd/The-Powder-Toy
Diffstat (limited to 'src/elements')
| -rw-r--r-- | src/elements/newgraphics.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/elements/newgraphics.c b/src/elements/newgraphics.c index 8af0f45..c846b94 100644 --- a/src/elements/newgraphics.c +++ b/src/elements/newgraphics.c @@ -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) |